From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Date: Mon, 9 Dec 2013 12:10:15 +0000 (+0200)
Subject: lxc-busybox: make securityfs bind-mount optional
X-Git-Tag: lxc-1.0.0.beta1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f1dea04a4045539fa92a7f7cbdbb0d091d6a4d2;p=thirdparty%2Flxc.git

lxc-busybox: make securityfs bind-mount optional

Prevent container start from failing when running Busybox containers on hosts without securityfs support.

Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 97614c668..823233449 100644
--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -292,7 +292,7 @@ EOF
             echo "lxc.mount.entry = /$dir $dir none ro,bind 0 0" >> $path/config
         fi
     done
-    echo "lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind 0 0" >>$path/config
+    echo "lxc.mount.entry = /sys/kernel/security sys/kernel/security none ro,bind,optional 0 0" >>$path/config
     echo "lxc.mount.auto = proc:mixed sys" >>$path/config
 }