From: Daniel Baumann <daniel@debian.org>
Date: Sun, 31 Aug 2008 18:29:20 +0000 (+0200)
Subject: Disabling default usage of local swap partitions. Can be enabled with the 'swapon... 
X-Git-Tag: debian/2.0.15-1~447
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=e170719f72d4b5805f9278ed87c21497308ab1b0;p=live-boot-grml.git

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.
---

diff --git a/docs/parameters.txt b/docs/parameters.txt
index 16b5b46..e09089d 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -35,7 +35,7 @@ live noxautologin
 live nofastboot
 live nopersistent
 live nosudo
-live noswap
+live swapon
 live nouser
 live noxautoconfig
 live persistent
diff --git a/manpages/live-initramfs.en.7.txt b/manpages/live-initramfs.en.7.txt
index eb2e302..a66a85c 100644
--- a/manpages/live-initramfs.en.7.txt
+++ b/manpages/live-initramfs.en.7.txt
@@ -183,9 +183,9 @@ Do not prompt to eject the CD on reboot.
 
 This parameter disables the automatic configuration of sudo.
 
-  noswap::
+  swapon::
 
-This parameter disables usage of local swap partitions.
+This parameter enables usage of local swap partitions.
 
   nouser::
 
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