From 03b03982dd0b850e8b09f5ed44e78522d7754eae Mon Sep 17 00:00:00 2001 From: KATOH Yasufumi Date: Fri, 12 Aug 2016 17:04:15 +0900 Subject: [PATCH 1/2] doc: Update lxc-attach(1) * Add undocumented options (-v/--set-var, --keep-var, -f/--rcfile) * Change order of option in SYNOPSIS (-L that is placed after "command") * Add long options in SYNOPSIS Signed-off-by: KATOH Yasufumi --- doc/lxc-attach.sgml.in | 59 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in index 3b103f90b..7535bb114 100644 --- a/doc/lxc-attach.sgml.in +++ b/doc/lxc-attach.sgml.in @@ -50,15 +50,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA lxc-attach - -n name - -a arch - -e - -s namespaces - -R + -n, --name name + -f, --rcfile config_file + -a, --arch arch + -e, --elevated-privileges privileges + -s, --namespaces namespaces + -R, --remount-sys-proc --keep-env --clear-env + -L, --pty-log file + -v, --set-var variable + --keep-var variable -- command - -L file @@ -102,6 +105,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + + + + + Specify the configuration file to configure the virtualization + and isolation functionalities for the container. + + + This configuration file if present will be used even if there is + already a configuration file present in the previously created + container (via lxc-create). + + + + @@ -252,6 +272,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + + + + + Set an additional environment variable that is seen by the + attached program in the container. It is specified in the + form of "VAR=VALUE", and can be specified multiple times. + + + + + + + + + + + Keep a specified environment variable. It can only be + specified in conjunction + with --clear-env, and can be + specified multiple times. + + + + From c91e90b5bdaa56aa6ed6291c3ebc2049a7a2f08b Mon Sep 17 00:00:00 2001 From: KATOH Yasufumi Date: Fri, 12 Aug 2016 17:29:55 +0900 Subject: [PATCH 2/2] doc: Update Japanese lxc-attach(1) * Add undocumented options (-v/--set-var, --keep-var, -f/--rcfile) * Change order of option in SYNOPSIS (-L that is placed after "command") * Add long options in SYNOPSIS Signed-off-by: KATOH Yasufumi --- doc/ja/lxc-attach.sgml.in | 71 +++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/doc/ja/lxc-attach.sgml.in b/doc/ja/lxc-attach.sgml.in index 25322dae5..f04ee021b 100644 --- a/doc/ja/lxc-attach.sgml.in +++ b/doc/ja/lxc-attach.sgml.in @@ -55,15 +55,18 @@ by KATOH Yasufumi lxc-attach - -n name - -a arch - -e - -s namespaces - -R + -n, --name name + -f, --rcfile config_file + -a, --arch arch + -e, --elevated-privileges privileges + -s, --namespaces namespaces + -R, --remount-sys-proc --keep-env --clear-env + -L, --pty-log file + -v, --set-var variable + --keep-var variable -- command - -L file @@ -121,6 +124,29 @@ by KATOH Yasufumi + + + + + + + + コンテナの仮想化、隔離機能の設定のための設定ファイルを指定します。 + + + + (lxc-create 経由で) 前もってコンテナが作られた際の設定ファイルが既にあった場合でも、このオプションが指定された場合は、指定した設定ファイルが使用されます。 + + + + @@ -334,6 +360,39 @@ by KATOH Yasufumi + + + + + + + + コンテナにアタッチしたプログラムから見える環境変数を追加します。このオプションは "VAR=VALUE" の形式で指定し、複数回指定できます。 + + + + + + + + + + + + --clear-env を指定した際に、クリアせずに保持したままにしたい環境変数を指定します。--clear-env と同時にしか使えません。複数回指定できます。 + + + +