X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F3020-swapon;h=a1bcdbec2fc5ad4cb23af56a0bad4e5a7a4d8e0f;hb=63be2febead200d33e4a0f734df243551cc9800a;hp=82e998a87db275aeb090d0e3e8526e0818f16d13;hpb=d0fe6311af9fbeaa1f6dbc185fa97e1ce4f5347d;p=live-boot-grml.git

diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
index 82e998a..a1bcdbe 100755
--- a/scripts/boot/3020-swapon
+++ b/scripts/boot/3020-swapon
@@ -4,7 +4,7 @@
 
 Swap ()
 {
-	for _PARAMETER in ${_CMDLINE}
+	for _PARAMETER in ${LIVE_BOOT_CMDLINE}
 	do
 		case "${_PARAMETER}" in
 			live-boot.swap=*|swap=*)
@@ -18,21 +18,16 @@ Swap ()
 		esac
 	done
 
-	if [ "${LIVE_SWAP}" != "true" ]
-	then
-		return 0
-	fi
+	case "${LIVE_SWAP}" in
+		true)
+			;;
 
-	LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}"
+		*)
+			return 0
+			;;
+	esac
 
-	if [ -e /run ]
-	then
-		# wheezy
-		_FSTAB="/root/etc/fstab.d/swap"
-	else
-		# squeeze
-		_FSTAB="/root/etc/fstab"
-	fi
+	LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}"
 
 	for _DEVICE in $(echo ${LIVE_SWAP_DEVICES} | sed -e 's|,| |g')
 	do
@@ -53,15 +48,15 @@ Swap ()
 	done
 
 	# Remove all auto swap entries
-	if grep -qs "swap swap" "${_FSTAB}"
+	if grep -qs "swap swap" /root/etc/fstab.d/swap
 	then
-		grep -v "swap swap" "${_FSTAB}" > "${_FSTAB}".tmp
-		mv "${_FSTAB}".tmp "${_FSTAB}"
+		grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp
+		mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap
 	fi
 
 	# Add new swap entries
 	for _DEVICE in ${_SWAP_DEVICES}
 	do
-		echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}"
+		echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab.d/swap
 	done
 }