[SCM] live-initramfs branch, master, updated. 1.157.3-1-14-gf529352

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f529352077d7180436680c88aa9c7c661ca826b9
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri Oct 16 16:03:29 2009 +0200

    Applying patch from Holger Brunn <holger.brunn at web.de> to live-media-path when toram is used (Closes: #534878).

diff --git a/scripts/live b/scripts/live
index 6af9825..ab2db29 100755
--- a/scripts/live
+++ b/scripts/live
@@ -630,7 +630,7 @@ copy_live_to ()
 
 	if [ -z "${MODULETORAM}" ]
 	then
-		size=$(fs_size "" ${copyfrom} "used")
+		size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used")
 	else
 		MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
 
@@ -688,7 +688,8 @@ copy_live_to ()
 		then
 			cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
 		else
-			cp -a ${copyfrom}/* ${copyto}   # "cp -a" from busybox also copies hidden files
+			mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
+			cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}   # "cp -a" from busybox also copies hidden files
 		fi
 
 		umount ${copyfrom}

-- 
live-initramfs