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.148.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
13swap
diff --git
a/scripts/live-bottom/13swap
b/scripts/live-bottom/13swap
index
4f6be9d
..
8fc718c
100755
(executable)
--- a/
scripts/live-bottom/13swap
+++ b/
scripts/live-bottom/13swap
@@
-20,37
+20,45
@@
esac
# live-initramfs header
# live-initramfs header
+if [ -z "${SWAPON}" ] || [ -n "${NOFSTAB}" ]
+then
+ exit 0
+fi
+
. /scripts/live-functions
. /scripts/live-functions
-log_begin_msg "Setting up swap
...
"
+log_begin_msg "Setting up swap"
# live-initramfs script
FSTAB=/root/etc/fstab
# live-initramfs script
FSTAB=/root/etc/fstab
+devices=""
-if [ -n "${NOSWAP}" ]
-then
- exit 0
-fi
+for device in /dev/[hs]d[a-z][0-9]*
+do
+ if ! [ -b "${device}" ]
+ then
+ continue
+ fi
-devices=""
-for device in /dev/[hs]d[a-z][0-9]*; do
- if ! [ -b "$device" ]; then
- continue
- fi
+ /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
-
magic=$(/bin/dd if="$device
" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
+
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
-# log "Found $device"
- devices="$devices $device"
- fi
+ if [ "${magic}" = "SWAPSPACE2" -o "${magic}" = "SWAP-SPACE" ]
+ then
+ #log "Found ${device}"
+ devices="${devices} ${device}"
+ fi
done
done
-for device in $devices; do
- cat >> $FSTAB <<EOF
-$device swap swap defaults 0 0
+for device in ${devices}
+do
+
+cat >> ${FSTAB} << EOF
+${device} swap swap defaults 0 0
EOF
EOF
+
done
log_end_msg
done
log_end_msg