Adding upstream version 1.125.1.

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

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index 4f6be9d..f3af1cc 100755 (executable)
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,6 +20,11 @@ esac
 
 # live-initramfs header
 
+if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
+then
+       exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Setting up swap..."
@@ -27,30 +32,31 @@ log_begin_msg "Setting up swap..."
 # live-initramfs script
 
 FSTAB=/root/etc/fstab
-
-if [ -n "${NOSWAP}" ]
-then
-    exit 0
-fi
-
 devices=""
-for device in /dev/[hs]d[a-z][0-9]*; do
-    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
+for device in /dev/[hs]d[a-z][0-9]*
+do
+       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
 
-    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
 
-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
+
 done
 
 log_end_msg