projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set -u in live-snapshot only in debug mode.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
572b367
..
f9e4fe2
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-906,12
+906,16
@@
try_snap ()
else
# cpio.gz snapshot
cd "${snap_mount}"
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=$?
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
cd "${OLDPWD}"
fi
- umount "${snapback}"
+ umount "${snapback}"
|| log_warning_msg "failure to \"umount ${snapback}\""
if [ "${RES}" != "0" ]
then
if [ "${RES}" != "0" ]
then
@@
-919,10
+923,12
@@
try_snap ()
fi
else
fi
else
+ # Try to find if it could be a snapshot partition
dev=$(find_cow_device "${snap_label}")
dev=$(find_cow_device "${snap_label}")
- if [ -b
${dev}
]
+ if [ -b
"${dev}"
]
then
then
+ log_success_msg "found snapshot device on ${dev}"
if echo "${dev}" | grep -qs loop
then
# strange things happens, user confused?
if echo "${dev}" | grep -qs loop
then
# strange things happens, user confused?