summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-10-16 16:03:29 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:06 +0100
commit2b6c282a047dc10b0730dc508af5f57068b3def7 (patch)
treeef7e9b8c8263d5d3eab91d6bfd05c2779245905f /scripts
parent91ceaa9aef850754bbf35d00e2ca15e0d9513f98 (diff)
downloadlive-boot-2b6c282a047dc10b0730dc508af5f57068b3def7.tar.gz
live-boot-2b6c282a047dc10b0730dc508af5f57068b3def7.zip
Applying patch from Holger Brunn <holger.brunn@web.de> to live-media-path when toram is used (Closes: #534878).
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live5
1 files changed, 3 insertions, 2 deletions
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}