snap_mount="${2}"
snap_type="${3}"
- if [ ! -z "${snapdata}" ]
+ if [ -n "${snapdata}" ] && [ ! -b "${snapdata}" ]
then
log_success_msg "found snapshot: ${snapdata}"
snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
log_warning_msg "Impossible to include the ${snapfile} Snapshot file"
fi
-
elif [ -b "${snapdata}" ]
then
# Try to find if it could be a snapshot partition
dev="${snapdata}"
- log_success_msg "found snapshot device on ${dev}"
+ log_success_msg "found snapshot ${snap_type} device on ${dev}"
if echo "${dev}" | grep -qs loop
then
# strange things happens, user confused?
# first look at the one specified in the command line
case "${LIVE_MEDIA}" in
- removable)
+ removable-usb)
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
- for dev in $(subdevices "${sysblock}")
- do
- if check_dev "${dev}"
- then
- return 0
- fi
- done
+ if readlink ${sysblock}/device | grep -q usb
+ then
+ for dev in $(subdevices "${sysblock}")
+ do
+ if check_dev "${dev}"
+ then
+ return 0
+ fi
+ done
+ fi
fi
done
;;
- removable-usb)
+ removable)
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
do
- if [ "$(cat ${sysblock}/removable)" = "1" ] && readlink ${sysblock}/device | grep -q usb
+ if [ "$(cat ${sysblock}/removable)" = "1" ]
then
for dev in $(subdevices "${sysblock}")
do