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.

I believe the lenny, fedora, and debian templates also will need an
update.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/templates/lxc-lucid.in b/templates/lxc-lucid.in
index fb5aa6fe09a48ec4b77f7ad695896b1e41c43549..fe613139bba072fcd056b08515d2ceeaba4d5df1 100644 (file)
--- a/templates/lxc-lucid.in
+++ b/templates/lxc-lucid.in
@@ -260,7 +260,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-maverick.in b/templates/lxc-maverick.in
index a85a6ca0cadfa9eea0dc2b7a53a24b5c2f5cc290..0a8ac8e9301be20f8c42c5510d0e7f29538adcbd 100644 (file)
--- a/templates/lxc-maverick.in
+++ b/templates/lxc-maverick.in
@@ -183,7 +183,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-natty.in b/templates/lxc-natty.in
index c71596e3bb5d40ace60300c993cee9d9e37642e5..e7e38594b5bd250d36381af2c311f6c88a2c10af 100644 (file)
--- a/templates/lxc-natty.in
+++ b/templates/lxc-natty.in
@@ -184,7 +184,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