diff options
| author |   Michel Normand <michel.mno@free.fr> | 2009-11-13 11:48:29 +0100 |
|---|---|---|
| committer |   Daniel Lezcano <dlezcano@fr.ibm.com> | 2009-11-13 11:48:29 +0100 |
| commit | 3f4a86bf0f5548c4605eb682688d6b664866266c (patch) | |
| tree | 20fc94aba0dcc6dbfee298dda87034bd4a2e0dd7 | |
| parent | lxc: add a new lxc.mount.entry keyword (diff) | |
| download | lxc-3f4a86bf0f5548c4605eb682688d6b664866266c.tar.gz lxc-3f4a86bf0f5548c4605eb682688d6b664866266c.tar.bz2 lxc-3f4a86bf0f5548c4605eb682688d6b664866266c.zip | |
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>
| -rwxr-xr-x | scripts/lxc-debian.in | 7 |
1 files 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'" |