mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-02 18:09:33 +00:00
Code Issues Releases Wiki Activity

lxc-debian to not use empty mount table

Browse Source 
lxc should not save in config generated file the name of an
empty file if no additionnal mount point specified by user.

Signed-off-by: Michel Normand <michel_mno@laposte.net>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
This commit is contained in:
Michel Normand
2009-11-13 11:48:29 +01:00
committed by Daniel Lezcano
parent ab2d32f88c
commit 1846e71a27
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/lxc-debian.in
View File

@@ -136,7 +136,6 @@ lxc.network.flags = up
lxc.network.link = br0 lxc.network.link = br0
lxc.network.name = eth0 lxc.network.name = eth0
lxc.network.mtu = $MTU lxc.network.mtu = $MTU
lxc.mount = $TMPMNTFILE
lxc.rootfs = $ROOTFS lxc.rootfs = $ROOTFS
lxc.cgroup.devices.deny = a lxc.cgroup.devices.deny = a
# /dev/null and zero # /dev/null and zero
@@ -155,13 +154,18 @@ lxc.cgroup.devices.allow = c 5:2 rwm
# rtc # rtc
lxc.cgroup.devices.allow = c 254:0 rwm lxc.cgroup.devices.allow = c 254:0 rwm
EOF EOF
if [ ! -z "$TMPMNTFILE" ]; then
cat <<EOF >> $CONFFILE
lxc.mount = $TMPMNTFILE
EOF
fi
} }
write_lxc_mounts() { write_lxc_mounts() {
TMPMNTFILE=$(mktemp lxc.XXXXXXXXXX)
if [ ! -z "$MNTFILE" ]; then if [ ! -z "$MNTFILE" ]; then
TMPMNTFILE=$(mktemp lxc.$NAME.XXXXXXXXXX)
cp $MNTFILE $TMPMNTFILE cp $MNTFILE $TMPMNTFILE
fi fi
} }
@@ -312,7 +316,6 @@ create() {
# remove the configuration files # remove the configuration files
rm -f $CONFFILE rm -f $CONFFILE
rm -f $TMPMNTFILE
if [ "$RES" != "0" ]; then if [ "$RES" != "0" ]; then
echo "Failed to create '$NAME'" echo "Failed to create '$NAME'"