[SCM] live-boot branch, debian-next, updated. debian/3.0_a29-1-10-ge1ed2e6

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 77d39e16a51709e5c752ca2a4b6abc5274c3cdff
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 18:32:19 2012 +0200

    Updating swapon handling to new parameter handling.

diff --git a/initramfs-tools/scripts/live-bottom/12fstab b/initramfs-tools/scripts/live-bottom/12fstab
index e0b248a..d71800d 100755
--- a/initramfs-tools/scripts/live-bottom/12fstab
+++ b/initramfs-tools/scripts/live-bottom/12fstab
@@ -44,7 +44,7 @@ then
 	echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${FSTAB}"
 fi
 
-if [ -n "${SWAPON}" ]
+if [ -n "${LIVE_SWAPON}" ]
 then
 	devices=""
 
diff --git a/scripts/boot/cmdline.sh b/scripts/boot/cmdline.sh
index 18a9a2c..fb4e0cb 100755
--- a/scripts/boot/cmdline.sh
+++ b/scripts/boot/cmdline.sh
@@ -12,6 +12,11 @@ Cmdline ()
 				export LIVE_READ_ONLY
 				;;
 
+			live-boot.swapon)
+				LIVE_SWAPON="true"
+				export LIVE_SWAPON
+				;;
+
 			live-boot.verify-checksums|verify-checksums)
 				LIVE_VERIFY_CHECKSUMS="true"
 				export LIVE_VERIFY_CHECKSUMS
@@ -177,11 +182,6 @@ Cmdline ()
 				ramdisk_size="${ARGUMENT#ramdisk-size=}"
 				;;
 
-			swapon)
-				SWAPON="true"
-				export SWAPON
-				;;
-
 			persistence)
 				PERSISTENCE="true"
 				export PERSISTENCE

-- 
live-boot