local FSSIZE
# fstype misreports LUKS devices
- is_luks "${1}"
- if [ $? -eq 0 ]; then
+ if is_luks "${1}"
+ then
/lib/udev/vol_id -t ${1} 2>/dev/null
return
fi
do
load_keymap
- echo -n "Enter passphrase for ${fspath}: " >&6
+ echo -n "Enter passphrase for root filesystem: " >&6
read -s passphrase
echo "${passphrase}" > /tmp/passphrase
+ unset passphrase
exec 9</tmp/passphrase
/sbin/losetup ${options} -e "${encryption}" -p 9 "${dev}" "${fspath}"
error=${?}
break
fi
- echo -n "Something went wrong... Retry? [YES/no] " >&6
+ echo
+ echo -n "There was an error decrypting the root filesystem ... Retry? [Y/n] " >&6
read answer
- if [ 'no' = "${answer}" ]
+ if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
then
unset answer
break
pers_label="${1}"
cow_backing="/${pers_label}-backing"
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop)
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
do
for dev in $(subdevices "${sysblock}")
do
then
echo "${devname}"
return
- elif [ "$(get_fstype ${devname})" = "vfat" ]
- then
- # FIXME: all supported block devices should be scanned
- mkdir -p "${cow_backing}"
- try_mount "${devname}" "${cow_backing}" "rw"
-
- if [ -e "${cow_backing}/${pers_label}" ]
- then
- echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
- return 0
- else
- umount ${cow_backing}
- fi
fi
+
+ case "$(get_fstype ${devname})" in
+ vfat|ext2|ext3|jffs2)
+ mkdir -p "${cow_backing}"
+ try_mount "${devname}" "${cow_backing}" "rw"
+
+ if [ -f "${cow_backing}/${pers_label}" ]
+ then
+ echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+ return 0
+ else
+ umount ${cow_backing}
+ fi
+ ;;
+ *)
+ ;;
+ esac
done
done
}
filenames="${1}"
snap_backing="/snap-backing"
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop)
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
do
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
- if [ "${devfstype}" = "vfat" ] || [ "${devfstype}" = "ext2" ] || [ "${devfstype}" = "ext3" ] || [ "${devfstype}" = "jffs2" ]
- then
- # FIXME: all supported block devices should be scanned
- mkdir -p "${snap_backing}"
- try_mount "${devname}" "${snap_backing}" "ro"
-
- for filename in ${filenames}
- do
- if [ -e "${snap_backing}/${filename}" ]
- then
- echo "${devname} ${snap_backing} ${filename}"
- return 0
- fi
- done
-
- umount ${snap_backing}
- fi
+ case "${devfstype}" in
+ vfat|ext2|ext3|jffs2)
+ # FIXME: all supported block devices should be scanned
+ mkdir -p "${snap_backing}"
+ try_mount "${devname}" "${snap_backing}" "ro"
+
+ for filename in ${filenames}
+ do
+ if [ -f "${snap_backing}/${filename}" ]
+ then
+ echo "${devname} ${snap_backing} ${filename}"
+ return 0
+ fi
+ done
+
+ umount ${snap_backing}
+ ;;
+ esac
done
done
}
devname="${1}"
if [ -x /sbin/cryptsetup ]
then
- /sbin/cryptsetup isLuks "${devname}" 2>/dev/null
- return $?
+ /sbin/cryptsetup isLuks "${devname}" 2>/dev/null || ret=${?}
+ return ${ret}
else
return 1
fi