date:20151203

[lxc-devel] [PATCH] Add LXC_TARGET env to Japanese lxc.container.conf(5)

2015-12-03 Thread KATOH Yasufumi

Update for commit c154af9

Signed-off-by: KATOH Yasufumi 
---
 doc/ja/lxc.container.conf.sgml.in | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/ja/lxc.container.conf.sgml.in 
b/doc/ja/lxc.container.conf.sgml.in
index 7b46fff..b7e2a6c 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -2188,11 +2188,27 @@ mknod errno 0
  [lxc.rootfs]
   -->
   rootfs.mount へマウントされるコンテナのルートへのホスト上のパスです。
+ [lxc.rootfs]

  

   
-
+  
+
+  
+LXC_TARGET
+  
+  
+
+ 
+ stop フックの場合のみ使われます。コンテナのシャットダウンの場合は "stop"、リブートの場合は "reboot" 
が設定されます。
+
+  
+
+  
 
 
 
-- 
2.6.3

___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] doc: Add lxc.monitor.unshare to lxc.container.conf(5)

2015-12-03 Thread KATOH Yasufumi

Update for commit a8dfe4e and 6039eaa

Signed-off-by: KATOH Yasufumi 
---
 doc/ja/lxc.container.conf.sgml.in | 16 
 1 file changed, 16 insertions(+)

diff --git a/doc/ja/lxc.container.conf.sgml.in 
b/doc/ja/lxc.container.conf.sgml.in
index b7e2a6c..e830e25 100644
--- a/doc/ja/lxc.container.conf.sgml.in
+++ b/doc/ja/lxc.container.conf.sgml.in
@@ -2339,6 +2339,22 @@ mknod errno 0
 
 
   
+lxc.monitor.unshare
+  
+  
+
+  
+  この値が 0 でない場合、コンテナが初期化される前 (pre-start フックが実行される前) にマウント名前空間がホストから 
unshare されます。この機能を使う場合、スタート時に CAP_SYS_ADMIN ケーパビリティが必要です。デフォルト値は 0 です。
+
+  
+
+
+  
 lxc.group
   
   
-- 
2.6.3

___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Re: [lxc-devel] [PATCH] seccomp: support 32-bit arm on arm64, and 32-bit ppc on ppc64

2015-12-03 Thread Christian Brauner

On Wed, Dec 02, 2015 at 10:42:36PM +, Serge Hallyn wrote:
> Generally we enforce that a [arch] seccomp section can only be used on [arch].
> However, on amd64 we allow [i386] sections for i386 containers, and there we
> also take [all] sections and apply them for both 32- and 64-bit.
> 
> Do that also for ppc64 and arm64.  This allows seccomp-protected armhf
> containers to run on arm64.
> 
> Signed-off-by: Serge Hallyn 
> ---
>  src/lxc/seccomp.c | 24 
>  1 file changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
> index 0208646..c5f1885 100644
> --- a/src/lxc/seccomp.c
> +++ b/src/lxc/seccomp.c
> @@ -300,6 +300,20 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>   default_policy_action);
>   if (!compat_ctx)
>   goto bad;
> + } else if (native_arch == lxc_seccomp_arch_ppc64) {
> + cur_rule_arch = lxc_seccomp_arch_all;
> + compat_arch = SCMP_ARCH_PPC;
> + compat_ctx = get_new_ctx(lxc_seccomp_arch_ppc,
> + default_policy_action);
> + if (!compat_ctx)
> + goto bad;
> + } else if (native_arch == lxc_seccomp_arch_arm64) {
> + cur_rule_arch = lxc_seccomp_arch_all;
> + compat_arch = SCMP_ARCH_ARM;

I get SCMP_ARCH_PPC undeclared (first use in this function) error when I try to
compile it.
Either this needs to be ifdef'd (seccomp.c:305):

#ifdef SCMP_ARCH_PPC
} else if (native_arch == lxc_seccomp_arch_ppc64) {
cur_rule_arch = lxc_seccomp_arch_all;
compat_arch = SCMP_ARCH_PPC;
compat_ctx = get_new_ctx(lxc_seccomp_arch_ppc,
default_policy_action);
if (!compat_ctx)
goto bad;
#endif

Or we need to declare SCMP_ARCH_PPC in the following block by removing the ifdef
for SCMP_ARCH_PPC and make it a standard case (seccomp:174):

switch(n_arch) {
case lxc_seccomp_arch_i386: arch = SCMP_ARCH_X86; break;
case lxc_seccomp_arch_amd64: arch = SCMP_ARCH_X86_64; break;
case lxc_seccomp_arch_arm: arch = SCMP_ARCH_ARM; break;
#ifdef SCMP_ARCH_AARCH64
case lxc_seccomp_arch_arm64: arch = SCMP_ARCH_AARCH64; break;
#endif
#ifdef SCMP_ARCH_PPC64LE
case lxc_seccomp_arch_ppc64le: arch = SCMP_ARCH_PPC64LE; break;
#endif
#ifdef SCMP_ARCH_PPC64
case lxc_seccomp_arch_ppc64: arch = SCMP_ARCH_PPC64; break;
#endif
#ifdef SCMP_ARCH_PPC
case lxc_seccomp_arch_ppc: arch = SCMP_ARCH_PPC; break;
#endif

I can send a patch for this if you want.

> + compat_ctx = get_new_ctx(lxc_seccomp_arch_arm,
> + default_policy_action);
> + if (!compat_ctx)
> + goto bad;
>   }
>  
>   if (default_policy_action != SCMP_ACT_KILL) {
> @@ -327,7 +341,7 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>   if (strcmp(line, "[x86]") == 0 ||
>   strcmp(line, "[X86]") == 0) {
>   if (native_arch != lxc_seccomp_arch_i386 &&
> - native_arch != lxc_seccomp_arch_amd64) {
> + native_arch != 
> lxc_seccomp_arch_amd64) {
>   cur_rule_arch = 
> lxc_seccomp_arch_unknown;
>   continue;
>   }
> @@ -346,7 +360,8 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>  #ifdef SCMP_ARCH_ARM
>   else if (strcmp(line, "[arm]") == 0 ||
>   strcmp(line, "[ARM]") == 0) {
> - if (native_arch != lxc_seccomp_arch_arm) {
> + if (native_arch != lxc_seccomp_arch_arm &&
> + native_arch != 
> lxc_seccomp_arch_arm64) {
>   cur_rule_arch = 
> lxc_seccomp_arch_unknown;
>   continue;
>   }
> @@ -386,7 +401,8 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>  #ifdef SCMP_ARCH_PPC
>   else if (strcmp(line, "[ppc]") == 0 ||
>   strcmp(line, "[PPC]") == 0) {
> - if (native_arch != lxc_seccomp_arch_ppc) {
> + if (native_arch != lxc_seccomp_arch_ppc &&
> + native_arch != 
> lxc_seccomp_arch_ppc64) {
>   cur_rule_arch = 
> lxc_seccomp_arch_unknown;
>

Re: [lxc-devel] Snappy Install Instructions

2015-12-03 Thread Matthew Williams

I thought I'd offer a pr to the website docs to mention this:
https://github.com/lxc/linuxcontainers.org/pull/128

On Wed, Dec 2, 2015 at 4:28 AM, Stéphane Graber  wrote:

> Hi,
>
> I'd expect a mix of both. The CPU does get hammered for a while (shows
> 100% for LXD) but I'd also expect those dev boards running only a few
> tasks with limited input from the outside to also have very limited
> entropy available.
>
> On Wed, Nov 25, 2015 at 07:09:50AM +0100, Guido Jäkel wrote:
> > Dear Stéphane,
> >
> > reading this about "generating certificates" i wonder if the
> corresponding process is really busy in calculating or just waiting for
> some entropy for the random device (compare to
> /proc/sys/kernel/random/entropy_avail) ...
> >
> > Guido
> >
> > On 23.11.2015 22:23, Stéphane Graber wrote:
> > >[...]
> > > I don't know what device you're running it on, but for ARM devices it
> > > can take minutes (up to 10 or so) for it to generate the LXD server
> > > certificate, until that's done, any attempt to communicate with it will
> > > result in "LXD isn't running".
> >
> > ___
> > lxc-devel mailing list
> > lxc-devel@lists.linuxcontainers.org
> > http://lists.linuxcontainers.org/listinfo/lxc-devel
>
> --
> Stéphane Graber
> Ubuntu developer
> http://www.ubuntu.com
>
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
>
>
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] doc: Add Japanese manpage for lxc-copy

2015-12-03 Thread KATOH Yasufumi

Signed-off-by: KATOH Yasufumi 
---
 configure.ac|   1 +
 doc/ja/Makefile.am  |   1 +
 doc/ja/lxc-copy.sgml.in | 345 
 3 files changed, 347 insertions(+)
 create mode 100644 doc/ja/lxc-copy.sgml.in

diff --git a/configure.ac b/configure.ac
index 9e8e191..8dae3ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -733,6 +733,7 @@ AC_CONFIG_FILES([
doc/ja/lxc-clone.sgml
doc/ja/lxc-config.sgml
doc/ja/lxc-console.sgml
+   doc/ja/lxc-copy.sgml
doc/ja/lxc-create.sgml
doc/ja/lxc-destroy.sgml
doc/ja/lxc-device.sgml
diff --git a/doc/ja/Makefile.am b/doc/ja/Makefile.am
index 20a7021..183efd6 100644
--- a/doc/ja/Makefile.am
+++ b/doc/ja/Makefile.am
@@ -16,6 +16,7 @@ man_MANS = \
lxc-clone.1 \
lxc-config.1 \
lxc-console.1 \
+   lxc-copy.1 \
lxc-create.1 \
lxc-destroy.1 \
lxc-execute.1 \
diff --git a/doc/ja/lxc-copy.sgml.in b/doc/ja/lxc-copy.sgml.in
new file mode 100644
index 000..6c0d4aa
--- /dev/null
+++ b/doc/ja/lxc-copy.sgml.in
@@ -0,0 +1,345 @@
+
+
+
+
+]>
+
+
+
+  @LXC_GENERATE_DATE@
+
+  
+lxc-copy
+1
+  
+
+  
+lxc-copy
+
+
+  
+  既存のコンテナのコピー
+
+  
+
+  
+
+  lxc-copy
+  -n, --name name
+  -P, --lxcpath path
+  -N, --newname newname
+  -p, --newpath newpath
+  -B, --backingstorage 
backingstorage
+  -s, --snapshot
+  -K, --keepdata
+  -M, --keepmac
+  -L, --fssize size 
[unit]
+
+
+  lxc-copy
+  -n, --name name
+  -P, --lxcpath path
+  -N, --newname newname
+  -p, --newpath newpath
+  -e, --ephemeral
+  -B, --backingstorage 
backingstorage
+  -s, --snapshot
+  -K, --keepdata
+  -M, --keepmac
+  -L, --fssize size 
[unit]
+
+
+  lxc-copy
+  -n, --name name
+  -P, --lxcpath path
+  -N, --newname newname
+  -p, --newpath newpath
+  -R, --rename
+
+  
+
+  
+説明
+
+
+  
+  lxc-copy 
は、すでに存在するコンテナのコピーを作成します。オプションを指定することで、作成後にそのコピーを起動できます 
(コピーは一時的なコピーまたは永続的なコピーのどちらも可能です)。
+  このコマンドは lxc-clone と 
lxc-start-ephemeral の置き換えのコマンドです。
+
+
+  
+  lxc-copy は、既存のコンテナのコピーを作成します。
+  コピーは元のコンテナの完全なクローンにできます。この場合、単にコンテナのルートファイルシステムのすべてが、新しいコンテナにコピーされます。
+  
また、スナップショットを取得することも可能です。すなわち、元のコンテナの小さなコピーオンライトのコピーにするということです。この場合、コピーで指定するバッキングストレージがスナップショットをサポートしている必要があります。
+  スナップショットをサポートしているバッキングストレージは、現時点では aufs、btrfs、lvm (lvm 
デバイスはスナップショットのスナップショットはサポートしていません)、overlay、zfs です。
+
+  
+
+  
+  コピー先のバッキングストレージは、元のコンテナと同じタイプになるでしょう。ただし、ディレクトリバックエンドのコンテナのスナップショットは 
aufs と overlayfs で取得できますので例外です。
+
+
+
+  
+  -e 
オプションを指定した場合は、元のコンテナの一時的なスナップショットを作成し、起動します。一時的なコンテナの場合、設定ファイルに 
lxc.ephemeral = 1 がセットされ、シャットダウン後に削除されます。
+  -e と -D 
を同時に指定すると、元のコンテナの一時的ではないスナップショットを作成し、起動します。
+
+
+
+  
+  -e を指定した場合で、-N で 
newname としてコンテナの名前を指定しない場合は、スナップショットの名前はランダムで命名されます。
+
+
+
+  
+  -e で作成し、起動したコンテナは、コンテナ独自のマウントを行えます。現時点では 
aufs、bind、overlay
 という 3 つのタイプのマウントがサポートされています。
+  マウントタイプは -m 
オプションのサブオプションとして指定します。この指定はカンマ区切りで複数回指定できます。
+  aufs と overlay 
マウントの場合は、現時点では -m overlay=/src:/dest 
のように指定します。マウント先の dest 
を指定しない場合は、dest は src 
と同じになります。
+  読み込み専用の bind マウントは -m 
bind=/src:/dest:ro のように指定します。読み書き可能な 
bind マウントは -m 
bind=/src:/dest:rw のように指定します。bind 
マウントのデフォルトは読み書き可能ですので、読み書き可能なマウントを行う場合は省略できます。マウント先の 
dest を指定しない場合は、dest は 
src と同じになります。
+  複数のマウントを行う場合の例を示すと、-m 
bind=/src1:/dest1:ro,bind=/src2:ro,overlay=/src3:/dest3 のようになります。
+
+
+
+  
+  -m 
オプションで指定するマウント、オプション、指定フォーマットは変更される可能性があります。
+
+  
+
+  
+
+オプション
+
+
+
+ 
+-N,--newname 
newname 
+  
+   コピー先のコンテナの名前。
+  
+ 
+
+ 
+-p,--newpath 
newpath 
+  
+   コピー先のパス。
+  
+ 
+
+ 
+-R,--rename  
+  
+   元のコンテナをリネームします。
+  
+ 
+
+ 
+-s,--snapshot  
+  
+
+ 
元のコンテナのスナップショットを作成します。コピー先のバッキングストレージがスナップショットをサポートしている必要があります。現時点では 
aufs、btrfs、lvm、overlay、zfs が対象となります。
+   
+  
+ 
+
+ 
+-F,--foreground 
+  
+
+ スナップショットしたコンテナをフォアグラウンドで起動します。スナップショットしたコンテナのコンソールは現在の tty 
にアタッチされます。(このオプションは -e と同時の場合のみ指定できます。)
+
+  
+ 
+
+ 
+-d, --daemon 
+  
+
+ スナップショットしたコンテナをデーモンで起動します (一時的なコンテナではこのモードがデフォルトです)。
+ コンテナは tty 
を持ちませんので、エラーが発生しても何も表示されません。エラーをチェックするにはログファイルを使います。(このオプションは 
-e と同時の場合のみ指定できます。)
+
+  
+ 
+
+ 
+-m, --mount 
mounttype 
+  
+
+ スナップショットするコンテナで行うマウントを指定します。マウントタイプは {aufs, bind, overlay} 
のどれかで指定します。例えば -m bind=/src:/dest:ro,overlay=/src:/dest

Re: [lxc-devel] [PATCH] seccomp: support 32-bit arm on arm64, and 32-bit ppc on ppc64

2015-12-03 Thread Serge Hallyn

Quoting Christian Brauner (christian.brau...@mailbox.org):
> On Wed, Dec 02, 2015 at 10:42:36PM +, Serge Hallyn wrote:
> > Generally we enforce that a [arch] seccomp section can only be used on 
> > [arch].
> > However, on amd64 we allow [i386] sections for i386 containers, and there we
> > also take [all] sections and apply them for both 32- and 64-bit.
> > 
> > Do that also for ppc64 and arm64.  This allows seccomp-protected armhf
> > containers to run on arm64.
> > 
> > Signed-off-by: Serge Hallyn 
> > ---
> >  src/lxc/seccomp.c | 24 
> >  1 file changed, 20 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
> > index 0208646..c5f1885 100644
> > --- a/src/lxc/seccomp.c
> > +++ b/src/lxc/seccomp.c
> > @@ -300,6 +300,20 @@ static int parse_config_v2(FILE *f, char *line, struct 
> > lxc_conf *conf)
> > default_policy_action);
> > if (!compat_ctx)
> > goto bad;
> > +   } else if (native_arch == lxc_seccomp_arch_ppc64) {
> > +   cur_rule_arch = lxc_seccomp_arch_all;
> > +   compat_arch = SCMP_ARCH_PPC;
> > +   compat_ctx = get_new_ctx(lxc_seccomp_arch_ppc,
> > +   default_policy_action);
> > +   if (!compat_ctx)
> > +   goto bad;
> > +   } else if (native_arch == lxc_seccomp_arch_arm64) {
> > +   cur_rule_arch = lxc_seccomp_arch_all;
> > +   compat_arch = SCMP_ARCH_ARM;
> 
> I get SCMP_ARCH_PPC undeclared (first use in this function) error when I try 
> to
> compile it.

Hm, odd, I don't get that.  Newer libseccomp must always define them?

But anyway,

> Either this needs to be ifdef'd (seccomp.c:305):
> 
> #ifdef SCMP_ARCH_PPC
>   } else if (native_arch == lxc_seccomp_arch_ppc64) {
>   cur_rule_arch = lxc_seccomp_arch_all;
>   compat_arch = SCMP_ARCH_PPC;
>   compat_ctx = get_new_ctx(lxc_seccomp_arch_ppc,
>   default_policy_action);
>   if (!compat_ctx)
>   goto bad;
> #endif

That looks nicer, and probably need the same for the SCMP_ARCH_ARM block.

> Or we need to declare SCMP_ARCH_PPC in the following block by removing the 
> ifdef
> for SCMP_ARCH_PPC and make it a standard case (seccomp:174):
> 
>   switch(n_arch) {
>   case lxc_seccomp_arch_i386: arch = SCMP_ARCH_X86; break;
>   case lxc_seccomp_arch_amd64: arch = SCMP_ARCH_X86_64; break;
>   case lxc_seccomp_arch_arm: arch = SCMP_ARCH_ARM; break;
> #ifdef SCMP_ARCH_AARCH64
>   case lxc_seccomp_arch_arm64: arch = SCMP_ARCH_AARCH64; break;
> #endif
> #ifdef SCMP_ARCH_PPC64LE
>   case lxc_seccomp_arch_ppc64le: arch = SCMP_ARCH_PPC64LE; break;
> #endif
> #ifdef SCMP_ARCH_PPC64
>   case lxc_seccomp_arch_ppc64: arch = SCMP_ARCH_PPC64; break;
> #endif
> #ifdef SCMP_ARCH_PPC
>   case lxc_seccomp_arch_ppc: arch = SCMP_ARCH_PPC; break;
> #endif
> 
> I can send a patch for this if you want.

Please do.

thanks!
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Re: [lxc-devel] [PATCH] Add LXC_TARGET env to Japanese lxc.container.conf(5)

2015-12-03 Thread Stéphane Graber

On Thu, Dec 03, 2015 at 06:55:57PM +0900, KATOH Yasufumi wrote:
> Update for commit c154af9
> 
> Signed-off-by: KATOH Yasufumi 

Acked-by: Stéphane Graber 

> ---
>  doc/ja/lxc.container.conf.sgml.in | 18 +-
>  1 file changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/ja/lxc.container.conf.sgml.in 
> b/doc/ja/lxc.container.conf.sgml.in
> index 7b46fff..b7e2a6c 100644
> --- a/doc/ja/lxc.container.conf.sgml.in
> +++ b/doc/ja/lxc.container.conf.sgml.in
> @@ -2188,11 +2188,27 @@ mknod errno 0
> [lxc.rootfs]
>-->
>rootfs.mount へマウントされるコンテナのルートへのホスト上のパスです。
> +   [lxc.rootfs]
>   
> 
>   
>
> -
> +  
> +
> +  
> +LXC_TARGET
> +  
> +  
> +
> +   
> +   stop フックの場合のみ使われます。コンテナのシャットダウンの場合は "stop"、リブートの場合は "reboot" 
> が設定されます。
> +
> +  
> +
> +  
>  
>  
>  
> -- 
> 2.6.3
> 
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com


signature.asc
Description: Digital signature
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Re: [lxc-devel] [PATCH] doc: Add lxc.monitor.unshare to lxc.container.conf(5)

2015-12-03 Thread Stéphane Graber

On Thu, Dec 03, 2015 at 08:48:18PM +0900, KATOH Yasufumi wrote:
> Update for commit a8dfe4e and 6039eaa
> 
> Signed-off-by: KATOH Yasufumi 

Acked-by: Stéphane Graber 

> ---
>  doc/ja/lxc.container.conf.sgml.in | 16 
>  1 file changed, 16 insertions(+)
> 
> diff --git a/doc/ja/lxc.container.conf.sgml.in 
> b/doc/ja/lxc.container.conf.sgml.in
> index b7e2a6c..e830e25 100644
> --- a/doc/ja/lxc.container.conf.sgml.in
> +++ b/doc/ja/lxc.container.conf.sgml.in
> @@ -2339,6 +2339,22 @@ mknod errno 0
>  
>  
>
> +lxc.monitor.unshare
> +  
> +  
> +
> +  
> +  この値が 0 でない場合、コンテナが初期化される前 (pre-start フックが実行される前) 
> にマウント名前空間がホストから unshare されます。この機能を使う場合、スタート時に CAP_SYS_ADMIN 
> ケーパビリティが必要です。デフォルト値は 0 です。
> +
> +  
> +
> +
> +  
>  lxc.group
>
>
> -- 
> 2.6.3
> 
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com


signature.asc
Description: Digital signature
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [lxc/lxc] ca3995: Conditional compilation for ARM and PPC

2015-12-03 Thread GitHub

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: ca3995947f654c39e6942e9b5325c0633993342a
  https://github.com/lxc/lxc/commit/ca3995947f654c39e6942e9b5325c0633993342a
  Author: Christian Brauner 
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
M src/lxc/seccomp.c

  Log Message:
  ---
  Conditional compilation for ARM and PPC

Check if symbols SCMP_ARCH_ARM and SCMP_ARCH_PPC are defined.

Signed-off-by: Christian Brauner 
Acked-by: Serge E. Hallyn 


  Commit: 842948e4162d89ffce0e8cd292702598d736489a
  https://github.com/lxc/lxc/commit/842948e4162d89ffce0e8cd292702598d736489a
  Author: KATOH Yasufumi 
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
M configure.ac
M doc/ja/Makefile.am
A doc/ja/lxc-copy.sgml.in

  Log Message:
  ---
  doc: Add Japanese manpage for lxc-copy

Signed-off-by: KATOH Yasufumi 
Acked-by: Stéphane Graber 


  Commit: 3c08e89391269ffe6ab6e16fd2085087f6dc4a40
  https://github.com/lxc/lxc/commit/3c08e89391269ffe6ab6e16fd2085087f6dc4a40
  Author: KATOH Yasufumi 
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
M doc/ja/lxc.container.conf.sgml.in

  Log Message:
  ---
  Add LXC_TARGET env to Japanese lxc.container.conf(5)

Update for commit c154af9

Signed-off-by: KATOH Yasufumi 
Acked-by: Stéphane Graber 


  Commit: 86b484e979f6114a372711f27cebbcfe17c5f693
  https://github.com/lxc/lxc/commit/86b484e979f6114a372711f27cebbcfe17c5f693
  Author: KATOH Yasufumi 
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
M doc/ja/lxc.container.conf.sgml.in

  Log Message:
  ---
  doc: Add lxc.monitor.unshare to lxc.container.conf(5)

Update for commit a8dfe4e and 6039eaa

Signed-off-by: KATOH Yasufumi 
Acked-by: Stéphane Graber 


Compare: https://github.com/lxc/lxc/compare/7635139aa801...86b484e979f6___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] Conditional compilation for ARM and PPC

2015-12-03 Thread Christian Brauner

Check if symbols SCMP_ARCH_ARM and SCMP_ARCH_PPC are defined.

Signed-off-by: Christian Brauner 
---
 src/lxc/seccomp.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
index c5f1885..5982cb4 100644
--- a/src/lxc/seccomp.c
+++ b/src/lxc/seccomp.c
@@ -300,6 +300,7 @@ static int parse_config_v2(FILE *f, char *line, struct 
lxc_conf *conf)
default_policy_action);
if (!compat_ctx)
goto bad;
+#ifdef SCMP_ARCH_PPC
} else if (native_arch == lxc_seccomp_arch_ppc64) {
cur_rule_arch = lxc_seccomp_arch_all;
compat_arch = SCMP_ARCH_PPC;
@@ -307,6 +308,8 @@ static int parse_config_v2(FILE *f, char *line, struct 
lxc_conf *conf)
default_policy_action);
if (!compat_ctx)
goto bad;
+#endif
+#ifdef SCMP_ARCH_ARM
} else if (native_arch == lxc_seccomp_arch_arm64) {
cur_rule_arch = lxc_seccomp_arch_all;
compat_arch = SCMP_ARCH_ARM;
@@ -314,6 +317,7 @@ static int parse_config_v2(FILE *f, char *line, struct 
lxc_conf *conf)
default_policy_action);
if (!compat_ctx)
goto bad;
+#endif
}
 
if (default_policy_action != SCMP_ACT_KILL) {
-- 
2.6.3

___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] Conditional compilation for ARM and PPC

2015-12-03 Thread Christian Brauner

Before commit 29753076fddfed772511c67887bed1f0621b32cf libseccomp does not
define the symbol SCMP_ARCH_PPC. Just for safety also add conditional
compilation instructions for SCMP_ARCH_ARM.

Christian Brauner (1):
  Conditional compilation for ARM and PPC

 src/lxc/seccomp.c | 4 
 1 file changed, 4 insertions(+)

-- 
2.6.3

___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Re: [lxc-devel] [PATCH] Conditional compilation for ARM and PPC

2015-12-03 Thread Serge Hallyn

Quoting Christian Brauner (christian.brau...@mailbox.org):
> Check if symbols SCMP_ARCH_ARM and SCMP_ARCH_PPC are defined.
> 
> Signed-off-by: Christian Brauner 

Acked-by: Serge E. Hallyn 

> ---
>  src/lxc/seccomp.c | 4 
>  1 file changed, 4 insertions(+)
> 
> diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
> index c5f1885..5982cb4 100644
> --- a/src/lxc/seccomp.c
> +++ b/src/lxc/seccomp.c
> @@ -300,6 +300,7 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>   default_policy_action);
>   if (!compat_ctx)
>   goto bad;
> +#ifdef SCMP_ARCH_PPC
>   } else if (native_arch == lxc_seccomp_arch_ppc64) {
>   cur_rule_arch = lxc_seccomp_arch_all;
>   compat_arch = SCMP_ARCH_PPC;
> @@ -307,6 +308,8 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>   default_policy_action);
>   if (!compat_ctx)
>   goto bad;
> +#endif
> +#ifdef SCMP_ARCH_ARM
>   } else if (native_arch == lxc_seccomp_arch_arm64) {
>   cur_rule_arch = lxc_seccomp_arch_all;
>   compat_arch = SCMP_ARCH_ARM;
> @@ -314,6 +317,7 @@ static int parse_config_v2(FILE *f, char *line, struct 
> lxc_conf *conf)
>   default_policy_action);
>   if (!compat_ctx)
>   goto bad;
> +#endif
>   }
>  
>   if (default_policy_action != SCMP_ACT_KILL) {
> -- 
> 2.6.3
> 
> ___
> lxc-devel mailing list
> lxc-devel@lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
___
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

[lxc-devel] [PATCH] Add LXC_TARGET env to Japanese lxc.container.conf(5)

[lxc-devel] [PATCH] doc: Add lxc.monitor.unshare to lxc.container.conf(5)

Re: [lxc-devel] [PATCH] seccomp: support 32-bit arm on arm64, and 32-bit ppc on ppc64

Re: [lxc-devel] Snappy Install Instructions

[lxc-devel] [PATCH] doc: Add Japanese manpage for lxc-copy

Re: [lxc-devel] [PATCH] seccomp: support 32-bit arm on arm64, and 32-bit ppc on ppc64

Re: [lxc-devel] [PATCH] Add LXC_TARGET env to Japanese lxc.container.conf(5)

Re: [lxc-devel] [PATCH] doc: Add lxc.monitor.unshare to lxc.container.conf(5)

[lxc-devel] [lxc/lxc] ca3995: Conditional compilation for ARM and PPC

[lxc-devel] [PATCH] Conditional compilation for ARM and PPC

[lxc-devel] [PATCH] Conditional compilation for ARM and PPC

Re: [lxc-devel] [PATCH] Conditional compilation for ARM and PPC

12 matches

Site Navigation

Mail list logo

Footer information