Correcting wrong order of boot parameter parsing.
authorDaniel Baumann <daniel@debian.org>
Wed, 5 Dec 2012 15:58:35 +0000 (16:58 +0100)
committerDaniel Baumann <daniel@debian.org>
Wed, 5 Dec 2012 15:58:35 +0000 (16:58 +0100)
scripts/config.sh

index 2a29828..c9e9a97 100755 (executable)
@@ -39,19 +39,14 @@ Cmdline ()
        for _PARAMETER in ${_CMDLINE}
        do
                case "${_PARAMETER}" in
-                       live-config|config)
-                               # Run all scripts
-                               _SCRIPTS="$(ls /lib/live/config/*)"
-                               ;;
-
                        live-config=*|config=*)
                                # Only run requested scripts
                                LIVE_CONFIGS="${_PARAMETER#*config=}"
                                ;;
 
-                       live-noconfig|noconfig)
-                               # Don't run any script
-                               _SCRIPTS=""
+                       live-config|config)
+                               # Run all scripts
+                               _SCRIPTS="$(ls /lib/live/config/*)"
                                ;;
 
                        live-noconfig=*|noconfig=*)
@@ -60,6 +55,11 @@ Cmdline ()
                                LIVE_NOCONFIGS="${_PARAMETER#*noconfig=}"
                                ;;
 
+                       live-noconfig|noconfig)
+                               # Don't run any script
+                               _SCRIPTS=""
+                               ;;
+
                        # Shortcuts
                        live-config.noroot|noroot)
                                # Disable root access, no matter what mechanism