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-1 no longer provides vol_id:
+ if [ -x /lib/udev/vol_id ]
then
- echo ${FSTYPE}
- return 0
+ /lib/udev/vol_id -t ${1} 2>/dev/null
+ else
+ eval $(blkid -o udev "${1}")
+ if [ -n "$ID_FS_TYPE" ]
+ then
+ echo "${ID_FS_TYPE}"
+ fi
fi
-
- /lib/udev/vol_id -t ${1} 2>/dev/null
}
where_is_mounted ()
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}" ]
+ # udev >=146-1 no longer provides vol_id:
+ if [ -x /lib/udev/vol_id ]
then
- echo "${devname}"
- return 0
+ if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
+ then
+ echo "${devname}"
+ return 0
+ fi
+ else
+ eval $(blkid -o udev "${devname}")
+ if [ "$ID_FS_LABEL" = "${pers_label}" ]
+ then
+ echo "${devname}"
+ return 0
+ fi
fi
if [ "${PERSISTENT}" = "nofiles" ]