diff options
| author | Michael Prokop <mika@grml.org> | 2010-01-31 13:49:33 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:06 +0100 |
| commit | 45a44dfbaec9d819567afa12238d9181dfbff5e6 (patch) | |
| tree | 63efe1efbcc9b41badb68336dd28595379f1d08b /scripts/live-bottom | |
| parent | e4b9ce3049d5eceb4cb815087062a5bed0d6c2ce (diff) | |
| download | live-boot-45a44dfbaec9d819567afa12238d9181dfbff5e6.tar.gz live-boot-45a44dfbaec9d819567afa12238d9181dfbff5e6.zip | |
Switch from vol_id to blkid if using udev >=146-1 (Closes: #555529).
Diffstat (limited to 'scripts/live-bottom')
| -rwxr-xr-x | scripts/live-bottom/12fstab | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab index 22c11a0..b2f187c 100755 --- a/scripts/live-bottom/12fstab +++ b/scripts/live-bottom/12fstab @@ -66,7 +66,10 @@ then continue fi - /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue + if [ -x /lib/udev/vol_id ] + then + /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | 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 |