From e170719f72d4b5805f9278ed87c21497308ab1b0 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 31 Aug 2008 20:29:20 +0200
Subject: Disabling default usage of local swap partitions. Can be enabled with
 the 'swapon' boot parameter. Thanks to Joseph Rawson <umeboshi3@gmail.com>
 for bringing it up.

---
 scripts/live               | 6 +++---
 scripts/live-bottom/13swap | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/live b/scripts/live
index 4ba4257..ba325a4 100755
--- a/scripts/live
+++ b/scripts/live
@@ -285,9 +285,9 @@ Arguments ()
 				export NOSUDO
 				;;
 
-			noswap)
-				NOSWAP="Yes"
-				export NOSWAP
+			swapon)
+				SWAPON="Yes"
+				export SWAPON
 				;;
 
 			noupdatenotifier)
diff --git a/scripts/live-bottom/13swap b/scripts/live-bottom/13swap
index ecbdce1..1975bd5 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
-- 
cgit v1.2.3