Only calling install-keymap if it's actually installed, which is always but in minima...

[live-boot-grml.git] / scripts / live-bottom / 13swap

diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index ecbdce1..8fc718c 100755 (executable)
--- 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