templates: don't put devpts in $confdir/container/fstab

src/lxc/conf.c will explicitly mount it anyway.  Furthermore, the fstab
entry, which is getting processed first, did not specify -o newinstance.
This can cause the host's devpts entry mount options to change, as in
https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/607636.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 9c69f37902ab04350dbaaf9a14397b8a9f2a6d22..27c041e6d29b07ef5d8491e2c9459de18f19644a 100644 (file)
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -218,7 +218,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 
 # mounts point
 lxc.mount.entry=proc $rootfs/proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry=devpts $rootfs/dev/pts devpts defaults 0 0
 lxc.mount.entry=sysfs $rootfs/sys sysfs defaults  0 0
 EOF
 

diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index f4f19c01439e19959b27262c3be76e627f8eabe9..bcdd81cf987e7b0c2587f2a5b7fdef4d2735238b 100644 (file)
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -225,7 +225,6 @@ EOF
 
     cat <<EOF > $path/fstab
 proc            $rootfs/proc         proc    nodev,noexec,nosuid 0 0
-devpts          $rootfs/dev/pts      devpts defaults 0 0
 sysfs           $rootfs/sys          sysfs defaults  0 0
 EOF
 

diff --git a/templates/lxc-lenny.in b/templates/lxc-lenny.in
index 8c051d91606e2c60c967dcbfbe9170ba70e3c25b..0f3798891854fbee66bf3fd1a74b6216052abe17 100644 (file)
--- a/templates/lxc-lenny.in
+++ b/templates/lxc-lenny.in
@@ -208,7 +208,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 
 # mounts point
 lxc.mount.entry=proc $rootfs/proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry=devpts $rootfs/dev/pts devpts defaults 0 0
 lxc.mount.entry=sysfs $rootfs/sys sysfs defaults  0 0
 EOF