From: Stéphane Graber <stgraber@ubuntu.com>
Date: Tue, 12 Nov 2013 18:45:23 +0000 (-0500)
Subject: lxc-ubuntu*: Mark non-essential mounts optional
X-Git-Tag: lxc-1.0.0.alpha3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d59feca3be9651b0ec38a57a8614cc2f3c51ca45;p=thirdparty%2Flxc.git

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 41f1c70b9..aeadc2dbd 100644
--- 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 9423f0fe2..3e296d83f 100644
--- 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