[SCM] live-boot branch, debian-next, updated. debian/2.0_a11-1-3-gd197dfe
Daniel Baumann
daniel at debian.org
Tue Jul 6 13:12:11 UTC 2010
The following commit has been merged in the debian-next branch:
commit d197dfe7342a91c8c8a889a80323993705614377
Author: Marco Amadori <amadorim at vdavda.com>
Date: Tue Jul 6 15:07:35 2010 +0200
Do not print misleading debug message if the snapshot was found correctly.
diff --git a/scripts/live b/scripts/live
index d35fb08..3a6094f 100755
--- a/scripts/live
+++ b/scripts/live
@@ -964,19 +964,20 @@ try_snap ()
snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
- RES=""
if ! try_mount "${snapdev}" "${snapback}" "ro"
then
break
fi
+ RES="0"
+
if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
then
# squashfs, jffs2 or ext2/ext3/ext4 snapshot
dev=$(get_backing_device "${snapback}/${snapfile}")
do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
- RES=$?
+ RES="$?"
else
# cpio.gz snapshot
@@ -992,7 +993,10 @@ try_snap ()
cpioargs='--unconditional --make-directories'
fi
- if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null)
+ cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
+ RES="$?"
+
+ if [ "${RES}" != "0" ]
then
log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
fi
--
live-boot
More information about the debian-live-changes
mailing list