Description: 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.
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/607636
Forwarded: yes

Index: lxc-0.7.4/templates/lxc-debian.in
===================================================================
--- lxc-0.7.4.orig/templates/lxc-debian.in	2011-05-06 12:06:20.906240318 -0500
+++ lxc-0.7.4/templates/lxc-debian.in	2011-05-06 12:06:45.056240324 -0500
@@ -224,7 +224,6 @@
 
 # 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
 
Index: lxc-0.7.4/templates/lxc-fedora.in
===================================================================
--- lxc-0.7.4.orig/templates/lxc-fedora.in	2011-05-06 12:06:17.556240318 -0500
+++ lxc-0.7.4/templates/lxc-fedora.in	2011-05-06 12:06:49.436240326 -0500
@@ -225,7 +225,6 @@
 
     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
 
Index: lxc-0.7.4/templates/lxc-lenny.in
===================================================================
--- lxc-0.7.4.orig/templates/lxc-lenny.in	2011-05-06 12:06:15.646240318 -0500
+++ lxc-0.7.4/templates/lxc-lenny.in	2011-05-06 12:06:47.126240324 -0500
@@ -208,7 +208,6 @@
 
 # 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
 
Index: lxc-0.7.4/templates/lxc-lucid.in
===================================================================
--- lxc-0.7.4.orig/templates/lxc-lucid.in	2011-05-06 12:06:08.036240316 -0500
+++ lxc-0.7.4/templates/lxc-lucid.in	2011-05-06 12:06:30.836240320 -0500
@@ -264,7 +264,6 @@
 
     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
 
Index: lxc-0.7.4/templates/lxc-maverick.in
===================================================================
--- lxc-0.7.4.orig/templates/lxc-maverick.in	2011-05-06 12:06:11.506240316 -0500
+++ lxc-0.7.4/templates/lxc-maverick.in	2011-05-06 12:06:36.866240322 -0500
@@ -187,7 +187,6 @@
 
     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
 
Index: lxc-0.7.4/templates/lxc-natty.in
===================================================================
--- lxc-0.7.4.orig/templates/lxc-natty.in	2011-05-06 12:06:13.556240316 -0500
+++ lxc-0.7.4/templates/lxc-natty.in	2011-05-06 12:06:38.916240322 -0500
@@ -184,7 +184,6 @@
 
     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
 
