From: Serge E. Hallyn Date: Fri, 6 May 2011 23:33:33 +0000 (+0200) Subject: templates: don't put devpts in $confdir/container/fstab X-Git-Tag: lxc-0.7.5~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2b2ec3160452acb017c75a527e3cd9e079bd91a;p=thirdparty%2Flxc.git 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 Signed-off-by: Daniel Lezcano --- diff --git a/templates/lxc-lucid.in b/templates/lxc-lucid.in index fb5aa6fe0..fe613139b 100644 --- a/templates/lxc-lucid.in +++ b/templates/lxc-lucid.in @@ -260,7 +260,6 @@ EOF cat < $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 a85a6ca0c..0a8ac8e93 100644 --- a/templates/lxc-maverick.in +++ b/templates/lxc-maverick.in @@ -183,7 +183,6 @@ EOF cat < $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 c71596e3b..e7e38594b 100644 --- a/templates/lxc-natty.in +++ b/templates/lxc-natty.in @@ -184,7 +184,6 @@ EOF cat < $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