X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F13swap;h=8fc718ca60033484ed1a8a07f44487bc74ff4dca;hb=refs%2Ftags%2Fupstream%2F1.156.1;hp=ecbdce1093370b058e96d269ad917d41858065f3;hpb=f4238ae20312e1d36158ba70ac1076ba4da0211d;p=live-boot-grml.git

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index ecbdce1..8fc718c 100755
--- a/scripts/live-bottom/13swap
+++ b/scripts/live-bottom/13swap
@@ -20,7 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
+if [ -z "${SWAPON}" ] || [ -n "${NOFSTAB}" ]
 then
 	exit 0
 fi
@@ -41,7 +41,7 @@ do
 		continue
 	fi
 
-	/lib/udev/vol_id ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
+	/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