Applying patch from Holger Brunn <holger.brunn@web.de> to live-media-path when toram...
authorDaniel Baumann <daniel@debian.org>
Fri, 16 Oct 2009 14:03:29 +0000 (16:03 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:48:06 +0000 (17:48 +0100)
scripts/live

index 6af9825..ab2db29 100755 (executable)
@@ -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}