aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Lezcano <daniel.lezcano@free.fr>2011-05-07 01:33:33 +0200
committerDaniel Lezcano <dlezcano@fr.ibm.com>2011-05-07 01:33:33 +0200
commitf66331efb095656e555d65e413808dc8d3f71587 (patch)
treea4ab4dc06c4494d47909c63121b10f6403f7863c /templates
parenttemplates: don't put devpts in $confdir/container/fstab (diff)
downloadlxc-f66331efb095656e555d65e413808dc8d3f71587.tar.gz
lxc-f66331efb095656e555d65e413808dc8d3f71587.tar.bz2
lxc-f66331efb095656e555d65e413808dc8d3f71587.zip
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. Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/lxc-debian.in1
-rw-r--r--templates/lxc-fedora.in1
-rw-r--r--templates/lxc-lenny.in1
3 files changed, 0 insertions, 3 deletions
diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 9c69f37..27c041e 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -218,7 +218,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm
# 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
diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index f4f19c0..bcdd81c 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -225,7 +225,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-lenny.in b/templates/lxc-lenny.in
index 8c051d9..0f37988 100644
--- a/templates/lxc-lenny.in
+++ b/templates/lxc-lenny.in
@@ -208,7 +208,6 @@ lxc.cgroup.devices.allow = c 254:0 rwm
# 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