-# 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
sysblock=${1}
r=""
- for dev in "${sysblock}" "${sysblock}"/*
+ for dev in "${sysblock}"/* "${sysblock}"
do
if [ -e "${dev}/dev" ]
then
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" ]
- then
- echo ${FSTYPE}
- return 0
- fi
-
- /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-boot.log && return 0 )
fi
}
{
# Returns a device containing a partition labeled "${pers_label}" or containing a file named the same way
# in the latter case the partition containing the file is left mounted
- # if is not in black_listed_devices
+ # if is not in black_listed_devices.
+ # Additionally, if the white_listed_devices list is non-empty, the
+ # parent block device of the returned device must be part of this list.
pers_label="${1}"
cow_backing="/${pers_label}-backing"
black_listed_devices="${2}"
+ white_listed_devices="${3}"
if [ -z "${PERSISTENT_PATH}" ]
then
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
+ fulldevname=$(sys2dev "${sysblock}")
+
+ if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+
+ if [ -n "${white_listed_devices}" ]
+ then
+ if echo "${white_listed_devices}" | grep -v -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+ fi
+
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
- if echo "${black_listed_devices}" | grep -q "${devname}"
+ if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
- # skip this device enterely
+ # skip this subdevice
break
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
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
;;
*)
find_files ()
{
# return the a string composed by device name, mountpoint an the first of ${filenames} found on a supported partition
+ # if is not in black_listed_devices.
+ # Additionally, if the white_listed_devices list is non-empty, the
+ # parent block device of the returned device must be part of this list.
# FIXME: merge with above function
filenames="${1}"
snap_backing="/snap-backing"
black_listed_devices="${2}"
+ white_listed_devices="${3}"
for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
do
+ fulldevname=$(sys2dev "${sysblock}")
+
+ if echo "${black_listed_devices}" | grep -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+
+ if [ -n "${white_listed_devices}" ]
+ then
+ if echo "${white_listed_devices}" | grep -v -q -w "${fulldevname}"
+ then
+ # skip this device entirely
+ break
+ fi
+ fi
+
for dev in $(subdevices "${sysblock}")
do
devname=$(sys2dev "${dev}")
devfstype="$(get_fstype ${devname})"
- if echo "${black_listed_devices}" | grep -q "${devname}"
+ if echo "${black_listed_devices}" | grep -q -w "${devname}"
then
- # skip this device enterely
+ # skip this subdevice
break
fi
fi
}
+
+removable_dev ()
+{
+ output_format="${1}"
+ want_usb="${2}"
+ ret=
+
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+ do
+ dev_ok=
+ if [ "$(cat ${sysblock}/removable)" = "1" ]
+ then
+ if [ -z "${want_usb}" ]
+ then
+ dev_ok="yes"
+ else
+ if readlink ${sysblock} | grep -q usb
+ then
+ dev_ok="yes"
+ fi
+ fi
+ fi
+
+ if [ "${dev_ok}" = "yes" ]
+ then
+ case "${output_format}" in
+ sys)
+ ret="${ret} ${sysblock}"
+ ;;
+ *)
+ devname=$(sys2dev "${sysblock}")
+ ret="${ret} ${devname}"
+ ;;
+ esac
+ fi
+ done
+
+ echo "${ret}"
+}
+
+removable_usb_dev ()
+{
+ output_format="${1}"
+
+ removable_dev "${output_format}" "want_usb"
+}
+
+non_removable_dev ()
+{
+ output_format="${1}"
+ ret=
+
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -vE "/(loop|ram|dm-|fd)")
+ do
+ if [ "$(cat ${sysblock}/removable)" = "0" ]
+ then
+ case "${output_format}" in
+ sys)
+ ret="${ret} ${sysblock}"
+ ;;
+ *)
+ devname=$(sys2dev "${sysblock}")
+ ret="${ret} ${devname}"
+ ;;
+ esac
+ fi
+ done
+
+ echo "${ret}"
+}
projects / live-boot-grml.git / blobdiff