X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=f9e4fe269c0154e4ffe70c29e4d8c50ea8b35227;hb=bdb01ba302ac1c351f62d95f123b722a5281be15;hp=572b367996ca13152acdd1037593c8fa438232f7;hpb=3da8a7a538e1e7bfe3fb9c5c15c1e7b9ea6de548;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 572b367..f9e4fe2 100755 --- a/scripts/live +++ b/scripts/live @@ -906,12 +906,16 @@ try_snap () else # cpio.gz snapshot cd "${snap_mount}" - zcat "${snapback}/${snapfile}" | cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories > /dev/null 2>&1 + zcat "${snapback}/${snapfile}" | /bin/cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories > /dev/null 2>&1 RES=$? + if [ "${RES}" != "0" ] + then + log_warning_msg "failure to \"zcat ${snapback}/${snapfile} | /bin/cpio --extract --preserve-modification-time --no-absolute-filenames --sparse --unconditional --make-directories\"" + fi cd "${OLDPWD}" fi - umount "${snapback}" + umount "${snapback}" || log_warning_msg "failure to \"umount ${snapback}\"" if [ "${RES}" != "0" ] then @@ -919,10 +923,12 @@ try_snap () fi else + # Try to find if it could be a snapshot partition dev=$(find_cow_device "${snap_label}") - if [ -b ${dev} ] + if [ -b "${dev}" ] then + log_success_msg "found snapshot device on ${dev}" if echo "${dev}" | grep -qs loop then # strange things happens, user confused?