X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F13swap;h=4980433174a8e5b88f27585790a4f30e427ddf9f;hb=fdd8036ba32ad88e83a61191cc4597ae060355d2;hp=8b47a0099d65b27b7742f4b3b00b5028430d9067;hpb=140b179f0ff73f3cc1c081f6e6641417a5a0788d;p=live-boot-grml.git

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index 8b47a00..4980433 100755
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,7 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ]
+if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
 then
 	exit 0
 fi
@@ -32,25 +32,31 @@ log_begin_msg "Setting up swap..."
 # live-initramfs script
 
 FSTAB=/root/etc/fstab
-
 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
+for device in $devices
+do
+
+cat >> $FSTAB << EOF
 $device swap swap defaults 0 0
 EOF
+
 done
 
 log_end_msg