-# live-initramfs helper functions, used by live-initramfs on boot and by live-snapshot
+# live-boot helper functions, used by live-boot on boot and by live-snapshot
if [ ! -x "/bin/fstype" ]
then
export PATH="${PATH}:/usr/lib/klibc/bin"
fi
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+ udevinfo='/sbin/udevadm info'
+else
+ udevinfo='udevinfo'
+fi
+
sys2dev ()
{
sysdev=${1#/sys}
- echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+ echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
}
subdevices ()
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
- 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
-
- /lib/udev/vol_id -t ${1} 2>/dev/null
}
where_is_mounted ()
if grep -q "^${device} " /proc/mounts
then
# return the first found
- grep "^${device} " /proc/mounts | cut -f2 -d ' '
+ grep -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
fi
}
local encryption=${5}
local readonly=${6}
- modprobe -q -b "${module}"
+ # the output of setup_loop is evaluated in other functions,
+ # modprobe leaks kernel options like "libata.dma=0"
+ # as "options libata dma=0" on stdout, causing serious
+ # problems therefor, so instead always avoid output to stdout
+ modprobe -q -b "${module}" 1>/dev/null
- if [ -x /sbin/udevadm ]
- then
- # lenny
- udevadm settle
- else
- # etch
- udevsettle
- fi
+ udevadm settle
for loopdev in ${pattern}
do
dev=$(sys2dev "${loopdev}")
options=''
- if [ -n ${readonly} ]
+ if [ -n "${readonly}" ]
then
if losetup --help 2>&1 | grep -q -- "-r\b"
then
if [ -n "${old_mountp}" ]
then
- mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ if [ "${opts}" != "ro" ]
+ then
+ mount -o remount,"${opts}" "${dev}" "${old_mountp}" || panic "Remounting ${dev} ${opts} on ${old_mountp} failed"
+ fi
+
mount -o bind "${old_mountp}" "${mountp}" || panic "Cannot bind-mount ${old_mountp} on ${mountp}"
else
if [ -z "${fstype}" ]
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
}
cow_backing="/${pers_label}-backing"
black_listed_devices="${2}"
+ if [ -z "${PERSISTENT_PATH}" ]
+ then
+ pers_fpath=${cow_backing}/${pers_label}
+ else
+ pers_fpath=${cow_backing}/${PERSISTENT_PATH}/${pers_label}
+ fi
+
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
for dev in $(subdevices "${sysblock}")
break
fi
- if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+ # Checking for a luks device
+ if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+ then
+ while true
+ do
+ load_keymap
+
+ /lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " | /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
+ error=${?}
+
+ devname="/dev/mapper/$(basename ${devname})"
+
+ if [ 0 -eq ${error} ]
+ then
+ unset error
+ break
+ fi
+
+ echo
+ echo -n "There was an error decrypting ${devname} ... Retry? [Y/n] " >&6
+ read answer
+
+ if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
+ then
+ unset answer
+ break
+ fi
+ done
+ fi
+
+ # udev (>= 146) no longer provides vol_id
+ if [ -x /lib/udev/vol_id ]
then
- echo "${devname}"
- return
+ # 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
- break
+ continue
fi
case "$(get_fstype ${devname})" in
- vfat|ext2|ext3|jffs2)
+ vfat|ext2|ext3|ext4|jffs2)
mkdir -p "${cow_backing}"
- if ! try_mount "${devname}" "${cow_backing}" "rw"
+ if try_mount "${devname}" "${cow_backing}" "rw"
then
- break
- fi
-
- if [ -f "${cow_backing}/${pers_label}" ]
- then
- echo $(setup_loop "${cow_backing}/${pers_label}" "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
;;
*)
esac
done
done
+ return 1
}
find_files ()
projects / live-boot-grml.git / blobdiff