lxc-ubuntu*: Mark non-essential mounts optional

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index 41f1c70b95cbf1f267c0563da83f736319b7ce09..aeadc2dbd9d8876de155ad1d280c629ad416948d 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -118,9 +118,9 @@ EOF
     cat <<EOF > $path/fstab
 proc            proc         proc    nodev,noexec,nosuid 0 0
 sysfs           sys          sysfs defaults  0 0
-/sys/fs/fuse/connections sys/fs/fuse/connections none bind 0 0
-/sys/kernel/debug sys/kernel/debug none bind 0 0
-/sys/kernel/security sys/kernel/security none bind 0 0
+/sys/fs/fuse/connections sys/fs/fuse/connections none bind,optional 0 0
+/sys/kernel/debug sys/kernel/debug none bind,optional 0 0
+/sys/kernel/security sys/kernel/security none bind,optional 0 0
 /sys/fs/pstore sys/fs/pstore none bind,optional 0 0
 EOF
 

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 9423f0fe2acdf796fe269cba96b66b58832f431b..3e296d83fea1168d5873e1a839bee6d842c19147 100644 (file)
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -427,9 +427,9 @@ EOF
     cat <<EOF > $path/fstab
 proc            proc         proc    nodev,noexec,nosuid 0 0
 sysfs           sys          sysfs defaults  0 0
-/sys/fs/fuse/connections sys/fs/fuse/connections none bind 0 0
-/sys/kernel/debug sys/kernel/debug none bind 0 0
-/sys/kernel/security sys/kernel/security none bind 0 0
+/sys/fs/fuse/connections sys/fs/fuse/connections none bind,optional 0 0
+/sys/kernel/debug sys/kernel/debug none bind,optional 0 0
+/sys/kernel/security sys/kernel/security none bind,optional 0 0
 /sys/fs/pstore sys/fs/pstore none bind,optional 0 0
 EOF