diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-03-15 21:11:06 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:07 +0100 |
| commit | 088e23d8225c53f92bc12125d95a11e165869a9a (patch) | |
| tree | 393f14b01717af758f44b1500941e69d87290904 /scripts/live-helpers | |
| parent | 2ee2da59624d6d328bdd249f13ea680c576d5e34 (diff) | |
| download | live-boot-088e23d8225c53f92bc12125d95a11e165869a9a.tar.gz live-boot-088e23d8225c53f92bc12125d95a11e165869a9a.zip | |
Adding proper code comments about vol_id removal.
Diffstat (limited to 'scripts/live-helpers')
| -rw-r--r-- | scripts/live-helpers | 8 |
1 files changed, 6 insertions, 2 deletions
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}" |