aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerge Hallyn <serge.hallyn@canonical.com>2011-07-25 00:22:50 +0200
committerDaniel Lezcano <dlezcano@fr.ibm.com>2011-07-25 00:22:50 +0200
commitc440536e7c4cc4836aca2cf3421509aaa8db2365 (patch)
tree8110d4af42216e00bc601ad7a10e223f5d9e5eb9 /templates
parentAdd arm as a supported srcarch (diff)
downloadlxc-c440536e7c4cc4836aca2cf3421509aaa8db2365.tar.gz
lxc-c440536e7c4cc4836aca2cf3421509aaa8db2365.tar.bz2
lxc-c440536e7c4cc4836aca2cf3421509aaa8db2365.zip
lxc-ubuntu: 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. Note - I messed up. This was applied upstream, but I dropped it in subsequent conversion to lxc-ubuntu template. It therefore needs to be reapplied. Signed-off-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/lxc-ubuntu.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 439e1d0..2934dc1 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -198,7 +198,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