projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding proper code comments about vol_id removal.
[live-boot-grml.git]
/
scripts
/
live-helpers
diff --git
a/scripts/live-helpers
b/scripts/live-helpers
index
fbf61fe
..
6777f99
100644
(file)
--- a/
scripts/live-helpers
+++ b/
scripts/live-helpers
@@
-76,25
+76,15
@@
is_supported_fs ()
get_fstype ()
{
get_fstype ()
{
- local FSTYPE
- local FSSIZE
-
- # fstype misreports LUKS devices
- if is_luks "${1}"
- then
- /lib/udev/vol_id -t ${1} 2>/dev/null
- return
- fi
-
- eval $(fstype ${1} 2>/dev/null)
-
- if [ "${FSTYPE}" != "unknown" ]
+ # udev (>= 146) no longer provides vol_id
+ if [ -x /lib/udev/vol_id ]
then
then
- echo ${FSTYPE}
- return 0
+ # lenny
+ /lib/udev/vol_id -t ${1} 2>/dev/null
+ else
+ # squeeze
+ /sbin/blkid -s TYPE -o value $1 2>/dev/null
fi
fi
-
- /lib/udev/vol_id -t ${1} 2>/dev/null
}
where_is_mounted ()
}
where_is_mounted ()
@@
-199,14
+189,7
@@
setup_loop ()
modprobe -q -b "${module}"
modprobe -q -b "${module}"
- if [ -x /sbin/udevadm ]
- then
- # lenny
- udevadm settle
- else
- # etch
- udevsettle
- fi
+ udevadm settle
for loopdev in ${pattern}
do
for loopdev in ${pattern}
do
@@
-295,7
+278,8
@@
try_mount ()
then
fstype=$(get_fstype "${dev}")
fi
then
fstype=$(get_fstype "${dev}")
fi
- mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || panic "Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}"
+ mount -t "${fstype}" -o "${opts}" "${dev}" "${mountp}" || \
+ ( echo "SKIPPING: Cannot mount ${dev} on ${mountp}, fstype=${fstype}, options=${opts}" > live.log && return 0 )
fi
}
fi
}
@@
-328,21
+312,14
@@
find_cow_device ()
fi
# Checking for a luks device
fi
# Checking for a luks device
- if [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+ if [
"${PERSISTENT}" = "cryptsetup" ] && [
-e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
then
while true
do
load_keymap
then
while true
do
load_keymap
- echo -n "Enter passphrase for ${pers_label} on ${devname}: " >&6
- read -s passphrase
- echo "${passphrase}" > /tmp/passphrase
- unset passphrase
- exec 9</tmp/passphrase
- /sbin/cryptsetup luksOpen ${devname} $(basename ${devname})
+ /lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " | /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
error=${?}
error=${?}
- exec 9<&-
- rm -f /tmp/passphrase
devname="/dev/mapper/$(basename ${devname})"
devname="/dev/mapper/$(basename ${devname})"
@@
-364,33
+341,43
@@
find_cow_device ()
done
fi
done
fi
- if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+ # udev (>= 146) no longer provides vol_id
+ if [ -x /lib/udev/vol_id ]
then
then
- echo "${devname}"
- return 0
+ # lenny
+ if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+ then
+ echo "${devname}"
+ return 0
+ fi
+ else
+ # squeeze
+ if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
+ then
+ echo "${devname}"
+ return 0
+ fi
fi
if [ "${PERSISTENT}" = "nofiles" ]
then
# do not mount the device to find for image files
# just skip this
fi
if [ "${PERSISTENT}" = "nofiles" ]
then
# do not mount the device to find for image files
# just skip this
- break
+ continue
fi
case "$(get_fstype ${devname})" in
vfat|ext2|ext3|ext4|jffs2)
mkdir -p "${cow_backing}"
fi
case "$(get_fstype ${devname})" in
vfat|ext2|ext3|ext4|jffs2)
mkdir -p "${cow_backing}"
- if ! try_mount "${devname}" "${cow_backing}" "rw"
- then
- break
- fi
-
- if [ -f "${pers_fpath}" ]
+ if try_mount "${devname}" "${cow_backing}" "rw"
then
then
- echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
- return 0
- else
- umount ${cow_backing}
+ if [ -f "${pers_fpath}" ]
+ then
+ echo $(setup_loop "${pers_fpath}" "loop" "/sys/block/loop*")
+ return 0
+ else
+ umount ${cow_backing} > /dev/null 2>&1 || true
+ fi
fi
;;
*)
fi
;;
*)