projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding upstream version 1.136.3.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
13swap
diff --git
a/scripts/live-bottom/13swap
b/scripts/live-bottom/13swap
index
4980433
..
303fbbb
100755
(executable)
--- a/
scripts/live-bottom/13swap
+++ b/
scripts/live-bottom/13swap
@@
-36,25
+36,27
@@
devices=""
for device in /dev/[hs]d[a-z][0-9]*
do
for device in /dev/[hs]d[a-z][0-9]*
do
- if ! [ -b "$
device
" ]
+ if ! [ -b "$
{device}
" ]
then
continue
fi
then
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
+
/lib/udev/vol_id ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" &&
continue
- if [ "$magic" = "SWAPSPACE2" -o "$magic" = "SWAP-SPACE" ]
+ magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
+
+ if [ "${magic}" = "SWAPSPACE2" -o "${magic}" = "SWAP-SPACE" ]
then
then
- #log "Found $
device
"
- devices="$
devices $device
"
+ #log "Found $
{device}
"
+ devices="$
{devices} ${device}
"
fi
done
fi
done
-for device in $
devices
+for device in $
{devices}
do
do
-cat >> $
FSTAB
<< EOF
-$
device
swap swap defaults 0 0
+cat >> $
{FSTAB}
<< EOF
+$
{device}
swap swap defaults 0 0
EOF
done
EOF
done