]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
revert inadvertent un-doing of lxc-clone fix
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Wed, 28 Nov 2012 15:57:59 +0000 (09:57 -0600)
committerSerge Hallyn <serge.hallyn@ubuntu.com>
Wed, 28 Nov 2012 15:57:59 +0000 (09:57 -0600)
commit 8f2c3a702aae3545b631a2b4c6db99f87528553a reverted a fix
for bad handling by lxc-clone of 'lxc.mount[ \t]' lines.
Fix.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
src/lxc/lxc-clone.in

index 05d993df280a7489acb770b36f4a9277497e69ee..04ef20bb2465055e50892d26a7afe5e3a449acc5 100644 (file)
@@ -175,7 +175,7 @@ cp $lxc_path/$lxc_orig/config $lxc_path/$lxc_new/config
 sed -i '/lxc.utsname/d' $lxc_path/$lxc_new/config
 echo "lxc.utsname = $hostname" >> $lxc_path/$lxc_new/config
 
-grep "lxc.mount =" $lxc_path/$lxc_new/config >/dev/null 2>&1 && { sed -i '/lxc.mount =/d' $lxc_path/$lxc_new/config; echo "lxc.mount = $lxc_path/$lxc_new/fstab" >> $lxc_path/$lxc_new/config; }
+grep "lxc.mount[ \t]" $lxc_path/$lxc_new/config >/dev/null 2>&1 && { sed -i '/lxc.mount[ \t]/d' $lxc_path/$lxc_new/config; echo "lxc.mount = $lxc_path/$lxc_new/fstab" >> $lxc_path/$lxc_new/config; }
 
 if [ -e  $lxc_path/$lxc_orig/fstab ];then
     cp $lxc_path/$lxc_orig/fstab $lxc_path/$lxc_new/fstab