From 088e23d8225c53f92bc12125d95a11e165869a9a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Mar 2010 21:11:06 +0100 Subject: [PATCH] Adding proper code comments about vol_id removal. --- scripts/live-bottom/12fstab | 3 +++ scripts/live-helpers | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab index ae90df8..cd78edf 100755 --- a/scripts/live-bottom/12fstab +++ b/scripts/live-bottom/12fstab @@ -66,10 +66,13 @@ then continue fi + # udev (>= 146) no longer provides vol_id if [ -x /lib/udev/vol_id ] then + # lenny /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue else + # squeeze /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue fi 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}" -- 2.1.4