aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Normand <michel.mno@free.fr>2009-11-13 11:48:29 +0100
committerDaniel Lezcano <dlezcano@fr.ibm.com>2009-11-13 11:48:29 +0100
commit0079c6c0daf68f3ac9d7f20ffdfa4946168c583a (patch)
tree5c13dbb448fae15945070e30861f25a22a45732e
parentlxc: remove lxc.mount setting in lxc-fedora script (diff)
downloadlxc-0079c6c0daf68f3ac9d7f20ffdfa4946168c583a.tar.gz
lxc-0079c6c0daf68f3ac9d7f20ffdfa4946168c583a.tar.bz2
lxc-0079c6c0daf68f3ac9d7f20ffdfa4946168c583a.zip
lxc lxc-sshd using new lxc.mount.entry keyword
Signed-off-by: Michel Normand <michel_mno@laposte.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
-rwxr-xr-xscripts/lxc-sshd.in18
1 files changed, 6 insertions, 12 deletions
diff --git a/scripts/lxc-sshd.in b/scripts/lxc-sshd.in
index 85c7e76..28e4140 100755
--- a/scripts/lxc-sshd.in
+++ b/scripts/lxc-sshd.in
@@ -348,7 +348,6 @@ untar_tarball() {
NAME="sshd"
CONFFILE="lxc.conf"
-MNTFILE="mount.conf"
UTSNAME=
IPV4="172.20.0.20/24"
@@ -390,26 +389,21 @@ lxc.network.flags = up
lxc.network.link = br0
lxc.network.ipv4 = $IPV4
lxc.network.name = eth0
-lxc.mount = $MNTFILE
lxc.rootfs = $ROOTFS
-EOF
-
-cat <<EOF > $MNTFILE
-/lib $(pwd)/$ROOTFS/lib none ro,bind 0 0
-/bin $(pwd)/$ROOTFS/bin none ro,bind 0 0
-/usr $(pwd)/$ROOTFS/usr none ro,bind 0 0
-/sbin $(pwd)/$ROOTFS/sbin none ro,bind 0 0
+lxc.mount.entry=/lib $(pwd)/$ROOTFS/lib none ro,bind 0 0
+lxc.mount.entry=/bin $(pwd)/$ROOTFS/bin none ro,bind 0 0
+lxc.mount.entry=/usr $(pwd)/$ROOTFS/usr none ro,bind 0 0
+lxc.mount.entry=/sbin $(pwd)/$ROOTFS/sbin none ro,bind 0 0
EOF
if [ "$(uname -m)" = "x86_64" ]; then
-cat <<EOF >> $MNTFILE
-/lib64 $(pwd)/$ROOTFS/lib64 none ro,bind 0 0
+cat <<EOF >> $CONFFILE
+lxc.mount.entry=/lib64 $(pwd)/$ROOTFS/lib64 none ro,bind 0 0
EOF
fi
@BINDIR@/lxc-create -n $NAME -f $CONFFILE
- rm -f $MNTFILE
rm -f $CONFFILE
echo "Done."