Updating internal cmdline handling.

diff --git a/scripts/boot.sh b/scripts/boot.sh
index d2a5c62..6304c97 100755 (executable)
--- 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 97%
rename from scripts/boot/arguments.sh
rename to scripts/boot/cmdline.sh
index 5f34512..18a9a2c 100755 (executable)
--- 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,7 +17,13 @@ Arguments ()
                                export LIVE_VERIFY_CHECKSUMS
                                ;;
 
-                       # parameters below need review
+                       # Special options
+                       live-boot.debug|debug)
+                               LIVE_DEBUG="true"
+                               ;;
+
+
+                       # parameters below need review (FIXME)
                        skipconfig)
                                NOFASTBOOT="true"
                                NOFSTAB="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