Correcting already-run checks to be after parameter handling in hostname and hooks...

diff --git a/scripts/config/0020-hostname b/scripts/config/0020-hostname
index 799feb1..b5fcab5 100755 (executable)
--- a/scripts/config/0020-hostname
+++ b/scripts/config/0020-hostname
@@ -10,15 +10,6 @@
 
 Hostname ()
 {
-       # Checking if package is installed or already configured
-       if [ -z "${LIVE_HOSTNAME}" ] || \
-          [ -e /var/lib/live/config/hostname ]
-       then
-               return
-       fi
-
-       echo -n " hostname"
-
        # Reading kernel command line
        for _PARAMETER in ${_CMDLINE}
        do
@@ -29,6 +20,15 @@ Hostname ()
                esac
        done
 
+       # Checking if package is installed or already configured
+       if [ -z "${LIVE_HOSTNAME}" ] || \
+          [ -e /var/lib/live/config/hostname ]
+       then
+               return
+       fi
+
+       echo -n " hostname"
+
        Configure_hostname
 }
 

diff --git a/scripts/config/9990-hooks b/scripts/config/9990-hooks
index f70548a..b7eddbb 100755 (executable)
--- a/scripts/config/9990-hooks
+++ b/scripts/config/9990-hooks
@@ -10,13 +10,7 @@
 
 Hooks ()
 {
-       if [ -z "${LIVE_HOOKS}" ]
-       then
-               return
-       fi
-
-       echo -n " hooks"
-
+       # Reading kernel command line
        for _PARAMETER in ${_CMDLINE}
        do
                case "${_PARAMETER}" in
@@ -26,6 +20,13 @@ Hooks ()
                esac
        done
 
+       if [ -z "${LIVE_HOOKS}" ]
+       then
+               return
+       fi
+
+       echo -n " hooks"
+
        Process_hooks
 }