X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F3020-swapon;fp=scripts%2Fboot%2F3020-swapon;h=281fd041f38c46afd78307fd91fed375de9569ab;hb=ea1d815ce23382da55f4f059171d84092f08a4a3;hp=158d81b11bc6623542c34fd0724d2fc2ccfa4488;hpb=d5e86414b0f52bb9d39ab2e9c12d98fe7a0e7f33;p=live-boot-grml.git

diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
index 158d81b..281fd04 100755
--- a/scripts/boot/3020-swapon
+++ b/scripts/boot/3020-swapon
@@ -4,7 +4,12 @@
 
 Swapon ()
 {
-	_DEVICES="/dev/sd* /dev/vd*"
+	if [ "${LIVE_SWAPON}" != "true" ]
+	then
+		return 0
+	fi
+
+	LIVE_SWAPON_DEVICES="${LIVE_SWAPON_DEVICES:-/dev/sd* /dev/vd*}"
 
 	if [ -e /run ]
 	then
@@ -15,7 +20,7 @@ Swapon ()
 		_FSTAB="/root/etc/fstab"
 	fi
 
-	for _DEVICE in ${_DEVICES}
+	for _DEVICE in $(echo ${LIVE_SWAPON_DEVICES} | sed -e 's|,| |g')
 	do
 		if [ ! -b "${_DEVICE}" ]
 		then
@@ -41,7 +46,7 @@ Swapon ()
 	fi
 
 	# Add new swap entries
-	for _DEVICE in _SWAP_DEVICES
+	for _DEVICE in ${_SWAP_DEVICES}
 	do
 		echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}"
 	done