From 3f4a86bf0f5548c4605eb682688d6b664866266c Mon Sep 17 00:00:00 2001
From: Michel Normand <michel.mno@free.fr>
Date: Fri, 13 Nov 2009 11:48:29 +0100
Subject: 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>
---
 scripts/lxc-debian.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/lxc-debian.in b/scripts/lxc-debian.in
index 7e907c5..ff9fe4d 100755
--- 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'"
-- 
cgit v1.2.3-65-gdbad