[PATCH 1/1] templates: don't put devpts in $confdir/container/fstab

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 templates/lxc-lucid.in    |    1 -
 templates/lxc-maverick.in |    1 -
 templates/lxc-natty.in    |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/templates/lxc-lucid.in b/templates/lxc-lucid.in
index fb5aa6f..fe61313 100644
--- 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 a85a6ca..0a8ac8e 100644
--- 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 c71596e..e7e3859 100644
--- 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
 
-- 
1.7.4.1

_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers


[Index of Archives]     [Cgroups]     [Netdev]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite Forum]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]

  Powered by Linux