X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F13swap;h=8fc718ca60033484ed1a8a07f44487bc74ff4dca;hb=902270d69d31c23c4798e225c3b0af75690a1c65;hp=8b47a0099d65b27b7742f4b3b00b5028430d9067;hpb=0a1b827c113b85f48bcd58e64ccd94d094b9bd8a;p=live-boot-grml.git

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index 8b47a00..8fc718c 100755
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,37 +20,45 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ]
+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
 
 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
+
+	/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
 
-    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