X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-helpers;h=6777f99772e6dc53a1f5599e19bc3d12648eeed7;hb=6759640353d9896cc0b6d4fe81085a0004d62143;hp=0cdc7555c9e8fed6a672d71e254770b28e335371;hpb=8bf665ed6207bba1309a81bde28718e41f9db7c8;p=live-boot-grml.git diff --git a/scripts/live-helpers b/scripts/live-helpers index 0cdc755..6777f99 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -76,11 +76,13 @@ is_supported_fs () get_fstype () { - # udev >=146-1 no longer provides vol_id: + # udev (>= 146) no longer provides vol_id if [ -x /lib/udev/vol_id ] then + # lenny /lib/udev/vol_id -t ${1} 2>/dev/null else + # squeeze /sbin/blkid -s TYPE -o value $1 2>/dev/null fi } @@ -339,15 +341,17 @@ find_cow_device () done fi - # udev >=146-1 no longer provides vol_id: + # udev (>= 146) no longer provides vol_id if [ -x /lib/udev/vol_id ] then + # 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}"