lxc-debian using new lxc.mount.entry keyword

Fix script to not add a fstab file. Signed-off-by: Michel Normand <michel_mno@laposte.net> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

lxc-debian using new lxc.mount.entry keyword
3f4a86bf · Michel Normand · Daniel Lezcano · e7938e9e · 3f4a86bf
Commit 3f4a86bf authored Nov 13, 2009 by Michel Normand Committed by Daniel Lezcano Nov 13, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

lxc-debian.in scripts/lxc-debian.in +3 -4

No files found.
--- a/scripts/lxc-debian.in
+++ b/scripts/lxc-debian.in
@@ -156,9 +156,7 @@ lxc.cgroup.devices.allow = c 254:0 rwm
 EOF

 	if [ ! -z "$TMPMNTFILE" ]; then
-cat <<EOF >> $CONFFILE
-lxc.mount = $TMPMNTFILE
-EOF
+		cat $TMPMNTFILE >> $CONFFILE
 	fi
 }

@@ -166,7 +164,7 @@ write_lxc_mounts() {

    if [ ! -z "$MNTFILE" ]; then
 	TMPMNTFILE=$(mktemp lxc.$NAME.XXXXXXXXXX)
-	cp $MNTFILE $TMPMNTFILE
+	sed -e 's/^\(.*\)/lxc.mount.entry=&/' $MNTFILE >$TMPMNTFILE
    fi
 }

@@ -316,6 +314,7 @@ create() {

    # remove the configuration files
    rm -f $CONFFILE
+    rm -f $TMPMNTFILE

    if [ "$RES" != "0" ]; then
 	echo "Failed to create '$NAME'"