[SCM] live-initramfs branch, master, updated. 1.157.4-1-2-gf464430

[Daniel Baumann]

The following commit has been merged in the master branch:
commit f464430661678fbbead56965cfa898968be9f583
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Oct 19 20:35:09 2009 +0200

    Restoring opt-in behavior for local swap partitions.

diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 22c11a0..04bf033 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -55,7 +55,7 @@ then
 	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
-if [ -z "${NOSWAP}" ]
+if [ -n "${SWAPON}" ]
 then
 	devices=""
 

-- 
live-initramfs