-# 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
get_fstype ()
{
- /lib/udev/vol_id -t ${1} 2>/dev/null
+ /sbin/blkid -s TYPE -o value $1 2>/dev/null
}
where_is_mounted ()
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
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
}
done
fi
- if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+ if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
then
echo "${devname}"
return 0
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
- 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
;;
*)