From f66331efb095656e555d65e413808dc8d3f71587 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Sat, 7 May 2011 01:33:33 +0200 Subject: [PATCH] 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 --- templates/lxc-debian.in | 1 - templates/lxc-fedora.in | 1 - templates/lxc-lenny.in | 1 - 3 files changed, 3 deletions(-) diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in index 9c69f3790..27c041e6d 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 f4f19c014..bcdd81cf9 100644 --- a/templates/lxc-fedora.in +++ b/templates/lxc-fedora.in @@ -225,7 +225,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-lenny.in b/templates/lxc-lenny.in index 8c051d916..0f3798891 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