Commit c6a46e86 by Serge E. Hallyn Committed by Daniel Lezcano

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: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 434d05fc
...@@ -260,7 +260,6 @@ EOF ...@@ -260,7 +260,6 @@ EOF
cat <<EOF > $path/fstab cat <<EOF > $path/fstab
proc $rootfs/proc proc nodev,noexec,nosuid 0 0 proc $rootfs/proc proc nodev,noexec,nosuid 0 0
devpts $rootfs/dev/pts devpts defaults 0 0
sysfs $rootfs/sys sysfs defaults 0 0 sysfs $rootfs/sys sysfs defaults 0 0
EOF EOF
......
...@@ -183,7 +183,6 @@ EOF ...@@ -183,7 +183,6 @@ EOF
cat <<EOF > $path/fstab cat <<EOF > $path/fstab
proc $rootfs/proc proc nodev,noexec,nosuid 0 0 proc $rootfs/proc proc nodev,noexec,nosuid 0 0
devpts $rootfs/dev/pts devpts defaults 0 0
sysfs $rootfs/sys sysfs defaults 0 0 sysfs $rootfs/sys sysfs defaults 0 0
EOF EOF
......
...@@ -184,7 +184,6 @@ EOF ...@@ -184,7 +184,6 @@ EOF
cat <<EOF > $path/fstab cat <<EOF > $path/fstab
proc $rootfs/proc proc nodev,noexec,nosuid 0 0 proc $rootfs/proc proc nodev,noexec,nosuid 0 0
devpts $rootfs/dev/pts devpts defaults 0 0
sysfs $rootfs/sys sysfs defaults 0 0 sysfs $rootfs/sys sysfs defaults 0 0
EOF EOF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment