summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-01 14:17:31 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:09 +0100
commita606391b56012c067ae44b20690df5ae39dbc052 (patch)
tree67f1e7e6902ffd8ac97013b73d13637fe7e449a5 /scripts
parentef95487ad06d43885cf8c22ee34156cddc753bd4 (diff)
downloadlive-boot-a606391b56012c067ae44b20690df5ae39dbc052.tar.gz
live-boot-a606391b56012c067ae44b20690df5ae39dbc052.zip
Merging casper 1.231.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/live b/scripts/live
index cdcbc18..7acf0d9 100755
--- a/scripts/live
+++ b/scripts/live
@@ -759,7 +759,11 @@ copy_live_to ()
rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console # "cp -a" from busybox also copies hidden files
else
mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
- cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH} # "cp -a" from busybox also copies hidden files
+ cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}
+ if [ -e ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ]
+ then
+ cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ${copyto}
+ fi
fi
fi