projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91ceaa9
)
Applying patch from Holger Brunn <holger.brunn@web.de> to live-media-path when toram...
author
Daniel Baumann
<daniel@debian.org>
Fri, 16 Oct 2009 14:03:29 +0000
(16:03 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:48:06 +0000
(17:48 +0100)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
6af9825
..
ab2db29
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-630,7
+630,7
@@
copy_live_to ()
if [ -z "${MODULETORAM}" ]
then
if [ -z "${MODULETORAM}" ]
then
- size=$(fs_size "" ${copyfrom} "used")
+ size=$(fs_size "" ${copyfrom}
/${LIVE_MEDIA_PATH}
"used")
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
@@
-688,7
+688,8
@@
copy_live_to ()
then
cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
else
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}
fi
umount ${copyfrom}