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.
grml · Aug 31, 2008 · f98dc58 · f98dc58
1 parent 6823513
commit f98dc58
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -20,7 +20,7 @@ esac
 
 # live-initramfs header
 
-if [ -n "${NOSWAP}" ] || [ -n "${NOFSTAB}" ]
+if [ -z "${SWAPON}" ] || [ -n "${NOFSTAB}" ]
 then
 	exit 0
 fi