diff options
| -rw-r--r-- | docs/ChangeLog.casper | 14 | ||||
| -rwxr-xr-x | scripts/live-bottom/12fstab | 2 | ||||
| -rw-r--r-- | scripts/live-helpers | 9 |
3 files changed, 18 insertions, 7 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 8fd98ea..e5eed55 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,17 @@ +casper (1.174) karmic; urgency=low + + * debian/control: Increase dependency on initramfs-tools to get the version + that uses blkid, depend on util-linux as well + * hooks/casper: No need to copy vol_id into the initramfs image.· + * scripts/casper-bottom/13swap: Use blkid -o udev -p instead of vol_id, + there's probably a much cleaner way to check for RAID like this, but + this is the direct equivalent. + * scripts/casper-helpers (get_fstype): use a blkid call to get the type· + * scripts/casper-helpers (find_cow_device): use a blkid call to get the + label + + -- Scott James Remnant <scott@ubuntu.com> Tue, 12 May 2009 13:29:41 +0100 + casper (1.173) jaunty; urgency=low * Don't use head -n1 in where_is_mounted, we don't have head in the diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab index f1dc2e3..ae90df8 100755 --- a/scripts/live-bottom/12fstab +++ b/scripts/live-bottom/12fstab @@ -69,6 +69,8 @@ then if [ -x /lib/udev/vol_id ] then /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue + else + /sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue fi magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue diff --git a/scripts/live-helpers b/scripts/live-helpers index 1b4286d..0cdc755 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -81,11 +81,7 @@ get_fstype () then /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 + /sbin/blkid -s TYPE -o value $1 2>/dev/null fi } @@ -352,8 +348,7 @@ find_cow_device () return 0 fi else - eval $(blkid -o udev "${devname}") - if [ "$ID_FS_LABEL" = "${pers_label}" ] + if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ] then echo "${devname}" return 0 |