Adding upstream version 1.154.1.

[live-boot-grml.git] / scripts / live-bottom / 13swap

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index 4980433..8fc718c 100755 (executable)
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,14 +20,14 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
+if [ -z "${SWAPON}" ] || [ -n "${NOFSTAB}" ]
 then
        exit 0
 fi
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up swap..."
+log_begin_msg "Setting up swap"
 
 # live-initramfs script
 
@@ -36,25 +36,27 @@ devices=""
 
 for device in /dev/[hs]d[a-z][0-9]*
 do
-       if ! [ -b "$device" ]
+       if ! [ -b "${device}" ]
        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]*} 2>/dev/null | 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
-               #log "Found $device"
-               devices="$devices $device"
+               #log "Found ${device}"
+               devices="${devices} ${device}"
        fi
 done
 
-for device in $devices
+for device in ${devices}
 do
 
-cat >> $FSTAB << EOF
-$device swap swap defaults 0 0
+cat >> ${FSTAB} << EOF
+${device} swap swap defaults 0 0
 EOF
 
 done