[SCM] live-helper branch, master, updated. 1.0.5-2-58-ga7b34e6

Daniel Baumann daniel at debian.org
Wed Nov 11 12:33:49 UTC 2009


The following commit has been merged in the master branch:
commit 19197313966631e6a91478cfd5c630b5388ef3a7
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Nov 11 13:15:46 2009 +0100

    Simplyfing chroot copying in lh_binary_chroot.

diff --git a/helpers/lh_binary_chroot b/helpers/lh_binary_chroot
index 2023941..cef600e 100755
--- a/helpers/lh_binary_chroot
+++ b/helpers/lh_binary_chroot
@@ -88,13 +88,13 @@ if [ -d cache/stages_bootstrap ]
 then
 	${LH_ROOT_COMMAND} mv chroot chroot.tmp
 	${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
-	${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 	${LH_ROOT_COMMAND} touch chroot/chroot.cache
 else
 	${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
-	${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 fi
 
+${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
+
 if [ -f config/binary_rootfs/exclude ]
 then
 	# Read exclude file and expand wildcards.

-- 
live-helper



More information about the debian-live-changes mailing list