X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F13swap;h=1975bd52f5349316b2562e42399243c53d1e29d0;hb=938b9a368eb91a2dbfb5f5b4e75915378e99804d;hp=f3af1cce92af2467f14f3434f6cfd4c30bf39938;hpb=658c0f1514abe8176d76897c61cad8e0ba8ed610;p=live-boot-grml.git

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index f3af1cc..1975bd5 100755
--- 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
 
@@ -41,6 +41,8 @@ do
 		continue
 	fi
 
+	/lib/udev/vol_id ${device%%[0-9]*} | 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" ]