X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=0fa3900c5e7af3d3891e3dbc380c21b271ab8d82;hb=1492bea7cab5998e281097e6b1dda07f9bfdbf25;hp=19024298c03ce3ccdedab447435123466ff32a92;hpb=f23b71dd4dd681a155cd175f1dd8f9799dd1ed4e;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 1902429..0fa3900 100755
--- a/scripts/live
+++ b/scripts/live
@@ -673,7 +673,7 @@ copy_live_to ()
 
 	# begin copying (or uncompressing)
 	mkdir "${copyto}"
-	echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
+	log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
 	mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
 
 	if [ "${extension}" = "tgz" ]
@@ -686,10 +686,22 @@ copy_live_to ()
 	else
 		if [ -n "${MODULETORAMFILE}" ]
 		then
-			cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+			if [ -x /bin/rsync ]
+			then
+				echo " * Copying $MODULETORAMFILE to RAM" 1>/dev/console
+				rsync -a --progress ${MODULETORAMFILE} ${copyto} 1>/dev/console # copy only the filesystem module
+			else
+				cp ${MODULETORAMFILE} ${copyto} # copy only the filesystem module
+			fi
 		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
+			if [ -x /bin/rsync ]
+			then
+				echo " * Copying whole medium to RAM" 1>/dev/console
+				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
+			fi
 		fi
 
 		umount ${copyfrom}