diff options
| author |   Serge E. Hallyn <serge@hallyn.com> | 2011-05-07 01:33:33 +0200 |
|---|---|---|
| committer |   Daniel Lezcano <dlezcano@fr.ibm.com> | 2011-05-07 01:33:33 +0200 |
| commit | f2b2ec3160452acb017c75a527e3cd9e079bd91a (patch) | |
| tree | d36eaeb38a89868b14efbe3b7ab8b5cfd5faf90a /templates | |
| parent | lxc-execute: document the '--' option (diff) | |
| download | lxc-f2b2ec3160452acb017c75a527e3cd9e079bd91a.tar.gz lxc-f2b2ec3160452acb017c75a527e3cd9e079bd91a.tar.bz2 lxc-f2b2ec3160452acb017c75a527e3cd9e079bd91a.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.
I believe the lenny, fedora, and debian templates also will need an
update.
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/lxc-lucid.in | 1 | ||||
| -rw-r--r-- | templates/lxc-maverick.in | 1 | ||||
| -rw-r--r-- | templates/lxc-natty.in | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/templates/lxc-lucid.in b/templates/lxc-lucid.in index fb5aa6f..fe61313 100644 --- a/templates/lxc-lucid.in +++ b/templates/lxc-lucid.in @@ -260,7 +260,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-maverick.in b/templates/lxc-maverick.in index a85a6ca..0a8ac8e 100644 --- a/templates/lxc-maverick.in +++ b/templates/lxc-maverick.in @@ -183,7 +183,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-natty.in b/templates/lxc-natty.in index c71596e..e7e3859 100644 --- a/templates/lxc-natty.in +++ b/templates/lxc-natty.in @@ -184,7 +184,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 |