[SCM] live-initramfs branch, master, updated. debian/1.173.5-1-3-ge0f7245
Daniel Baumann
daniel at debian.org
Mon Mar 15 20:15:29 UTC 2010
The following commit has been merged in the master branch:
commit e0f7245e8533d9663fdd1e926c2537da0b243ed5
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Mar 15 21:11:06 2010 +0100
Adding proper code comments about vol_id removal.
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}"
--
live-initramfs
More information about the debian-live-changes
mailing list