diff options
| author | Marco Amadori <amadorim@vdavda.com> | 2010-07-06 15:07:35 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:53:26 +0100 |
| commit | 70df56d17f2c013627e0f4f512812c313c8e3b5a (patch) | |
| tree | 875980a28487a8273f2c16c267f56274cb4ec610 | |
| parent | 9ecfd3cdaa73ef39e4f8a1505f39183bc4edd523 (diff) | |
| download | live-boot-70df56d17f2c013627e0f4f512812c313c8e3b5a.tar.gz live-boot-70df56d17f2c013627e0f4f512812c313c8e3b5a.zip | |
Do not print misleading debug message if the snapshot was found correctly.
| -rwxr-xr-x | scripts/live | 10 |
1 files changed, 7 insertions, 3 deletions
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 |