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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3c6b4575a59c845178c0a02d2373c9109730cca8
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 18:23:15 2012 +0200

    Updating internal cmdline handling.

diff --git a/scripts/boot.sh b/scripts/boot.sh
index d2a5c62..6304c97 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -444,7 +444,14 @@ mountroot ()
 
 	. /live.vars
 
-	Arguments
+	_CMDLINE="$(cat /proc/cmdline)"
+	Cmdline
+
+	case "${LIVE_DEBUG}" in
+		true)
+			set -x
+			;;
+	esac
 
 	case "${LIVE_READ_ONLY}" in
 		true)
diff --git a/scripts/boot/arguments.sh b/scripts/boot/cmdline.sh
similarity index 98%
rename from scripts/boot/arguments.sh
rename to scripts/boot/cmdline.sh
index 08fb051..03e13df 100755
--- a/scripts/boot/arguments.sh
+++ b/scripts/boot/cmdline.sh
@@ -2,11 +2,11 @@
 
 #set -e
 
-Arguments ()
+Cmdline ()
 {
-	for ARGUMENT in $(cat /proc/cmdline)
+	for _PARAMETER in ${_CMDLINE}
 	do
-		case "${ARGUMENT}" in
+		case "${_PARAMETER}" in
 			live-boot.read-only|read-only)
 				LIVE_READ_ONLY="true"
 				export LIVE_READ_ONLY
@@ -17,6 +17,12 @@ Arguments ()
 				export LIVE_VERIFY_CHECKSUMS
 				;;
 
+			# Special options
+			live-boot.debug|debug)
+				LIVE_DEBUG="true"
+				;;
+
+
 			# parameters below need review
 			skipconfig)
 				NOFASTBOOT="true"
@@ -30,13 +36,6 @@ Arguments ()
 				BOOTIF="${x#BOOTIF=}"
 				;;
 
-			debug)
-				DEBUG="true"
-				export DEBUG
-
-				set -x
-				;;
-
 			dhcp)
 				# Force dhcp even while netbooting
 				# Use for debugging in case somebody works on fixing dhclient

-- 
live-boot