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.176.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
12fstab
diff --git
a/scripts/live-bottom/12fstab
b/scripts/live-bottom/12fstab
index
b2f187c
..
cd78edf
100755
(executable)
--- a/
scripts/live-bottom/12fstab
+++ b/
scripts/live-bottom/12fstab
@@
-55,7
+55,7
@@
then
echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
fi
echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
fi
-if [ -
z "${NOSWAP
}" ]
+if [ -
n "${SWAPON
}" ]
then
devices=""
then
devices=""
@@
-66,9
+66,14
@@
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
/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
magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || 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