summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-08-31 20:29:20 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:01 +0100
commite170719f72d4b5805f9278ed87c21497308ab1b0 (patch)
tree399290c40f5c8a93489b8c63ea94ff18e0dec104 /scripts
parent357ac91a9701e8a26648a293e0580129ba4a6cd5 (diff)
downloadlive-boot-e170719f72d4b5805f9278ed87c21497308ab1b0.tar.gz
live-boot-e170719f72d4b5805f9278ed87c21497308ab1b0.zip
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.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/live6
-rwxr-xr-xscripts/live-bottom/13swap2
2 files changed, 4 insertions, 4 deletions
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