X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=ad2d48e243097a04176fb06f733a02dee5980f9f;hb=6d73f92bf923d3f102f0bc1213c94b6227e804a0;hp=bef055aaa28074f6ee3e366969dcb5ed8c0da148;hpb=089ae56f49ab73a926c28d96baee58986ade09a8;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index bef055a..ad2d48e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -957,6 +957,8 @@ do_snap_copy ()
 
 	if [ -b "${fromdev}" ]
 	then
+		log_success_msg "Copying snapshot ${fromdev} to ${todir}..."
+
 		# look for free mem
 		if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]
 		then
@@ -994,9 +996,8 @@ do_snap_copy ()
 
 		return 0
 	else
-		return 1
-
 		log_warning_msg "Unable to find the snapshot ${snap_type} medium"
+		return 1
 	fi
 }
 
@@ -1004,16 +1005,17 @@ find_snap ()
 {
 	# Look for ${snap_label}.* in block devices
 	snap_label="${1}"
+	black_listed_devices="${2}"
 
 	if [ "${PERSISTENT}" != "nofiles" ]
 	then
 		# search for image files
-		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2")
+		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2" "${black_listed_devices}")
 	fi
 
 	if [ -z "${snapdata}" ]
 	then
-		snapdata=$(find_cow_device "${snap_label}")
+		snapdata=$(find_cow_device "${snap_label}" "${black_listed_devices}")
 	fi
 	echo "${snapdata}"
 }
@@ -1073,8 +1075,16 @@ try_snap ()
 				cpioargs='--unconditional --make-directories'
 			fi
 
-			cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
-			RES="$?"
+			if [ -s "${snapback}/${snapfile}" ]
+			then
+				BEFOREDIR="$(pwd)"
+				cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
+				RES="$?"
+				cd "${BEFOREDIR}"
+			else
+				log_warning_msg "${snapback}/${snapfile} is empty, adding it for sync on reboot."
+				RES="0"
+			fi
 
 			if [ "${RES}" != "0" ]
 			then
@@ -1106,7 +1116,7 @@ try_snap ()
 
 		if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
 		then
-			log_warning_msg "Impossible to include the ${snap_type} Snapshot"
+			log_warning_msg "Impossible to include the ${snap_type} Snapshot (i)"
 			return 1
 		else
 			if [ -n "${snapfile}" ]