From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 16 Sep 2013 16:48:38 +0000 (-0500)
Subject: ubuntu templates: make pstore fstab entry optional
X-Git-Tag: lxc-1.0.0.alpha2~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d7bcfb638c5c4907e8539aa09d41bb1de08a097;p=thirdparty%2Flxc.git

ubuntu templates: make pstore fstab entry optional

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index b024de8f7..47a5fcade 100644
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -116,7 +116,7 @@ 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/pstore sys/fs/pstore none bind 0 0
+/sys/fs/pstore sys/fs/pstore none bind,optional 0 0
 EOF
 
     # unprivileged user can't mknod these.  One day we may allow
diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 02ccbc28b..c872a839f 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -430,7 +430,7 @@ 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/pstore sys/fs/pstore none bind 0 0
+/sys/fs/pstore sys/fs/pstore none bind,optional 0 0
 EOF
 
     if [ $? -ne 0 ]; then