X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F13swap;h=4980433174a8e5b88f27585790a4f30e427ddf9f;hb=37137871b50bc2cd924a0f8447e2434bc8abf33e;hp=9d762f44731379fb32c1177e5790e1d4755b9b40;hpb=3d52fbcb4fe70132ade14759d76573b471294800;p=live-boot-grml.git

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index 9d762f4..4980433 100755
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -1,49 +1,62 @@
 #!/bin/sh
 
-PREREQ=""
-DESCRIPTION="Setting up swap..."
-FSTAB=/root/etc/fstab
+#set -e
 
-. /scripts/live-functions
+# initramfs-tools header
+
+PREREQ=""
 
 prereqs()
 {
-       echo "$PREREQ"
+	echo "${PREREQ}"
 }
 
-case $1 in
-# get pre-requisites
-prereqs)
-       prereqs
-       exit 0
-       ;;
+case "${1}" in
+	prereqs)
+		prereqs
+		exit 0
+		;;
 esac
 
-log_begin_msg "$DESCRIPTION"
+# live-initramfs header
 
-if [ -n "${SWAPOFF}" ]
+if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
 then
-    exit 0
+	exit 0
 fi
 
+. /scripts/live-functions
+
+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
 
-    if [ "$magic" = "SWAPSPACE2" -o "$magic" = "SWAP-SPACE" ]; then
-#        log "Found $device"
-        devices="$devices $device"
-        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
 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