diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-03-15 21:08:52 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:07 +0100 |
| commit | 2ee2da59624d6d328bdd249f13ea680c576d5e34 (patch) | |
| tree | b05d0f8d45adb68757045dfe8ccde4511cfa53e7 /scripts | |
| parent | 85e2939c446d0ead490be57d0a0edac9f6a3f772 (diff) | |
| download | live-boot-2ee2da59624d6d328bdd249f13ea680c576d5e34.tar.gz live-boot-2ee2da59624d6d328bdd249f13ea680c576d5e34.zip | |
Merging casper 1.174.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/12fstab | 2 | ||||
| -rw-r--r-- | scripts/live-helpers | 9 |
2 files changed, 4 insertions, 7 deletions
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 |