projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.206.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
12fstab
diff --git
a/scripts/live-bottom/12fstab
b/scripts/live-bottom/12fstab
index
ae90df8
..
cd78edf
100755
(executable)
--- a/
scripts/live-bottom/12fstab
+++ b/
scripts/live-bottom/12fstab
@@
-66,10
+66,13
@@
then
continue
fi
continue
fi
+ # udev (>= 146) no longer provides vol_id
if [ -x /lib/udev/vol_id ]
then
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
/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
/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
fi