hooks: Automatically set defaults for all port hooks

Before, this was broken so that all configuration parameters
had to be passed all the time.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.hook b/src/functions/functions.hook
index 2f3ced09be242d43441bc11c499ad6cd3bb03686..c0ebfcb5121ee4aa05e65111080a79a1fa4a1a74 100644 (file)
--- a/src/functions/functions.hook
+++ b/src/functions/functions.hook
@@ -130,9 +130,8 @@ hook_set_defaults() {
        for setting in ${HOOK_SETTINGS}; do
                local default="DEFAULT_${setting}"
 
-               if isset ${default}; then
-                       assign "${setting}" "${!default}"
-               fi
+               # Sets the default or empty
+               assign "${setting}" "${!default}"
        done
 }
 

diff --git a/src/header-port b/src/header-port
index ce1c1923945adefd8879303f560944d8d88cddee..141228ae89a22fe0eed7d90edc92ced11be39ba2 100644 (file)
--- a/src/header-port
+++ b/src/header-port
@@ -44,6 +44,10 @@ hook_hotplug_rename() {
 
 hook_default_new() {
        local ${HOOK_SETTINGS}
+
+       # Import all default variables
+       hook_set_defaults
+
        if ! hook_parse_cmdline "$@"; then
                return ${EXIT_ERROR}
        fi

diff --git a/src/hooks/ports/bonding b/src/hooks/ports/bonding
index 40d849fba16b2f84abc8a5e94c7cedc0cbcb06e6..f0572c3f5b496f45b3df8b33d55549bf412ae34b 100644 (file)
--- a/src/hooks/ports/bonding
+++ b/src/hooks/ports/bonding
@@ -23,9 +23,8 @@
 
 HOOK_SETTINGS="ADDRESS MIIMON MODE OFFLOADING SLAVES"
 
-SLAVES=""
-MIIMON=100
-MODE="balance-rr"
+DEFAULT_MIIMON=100
+DEFAULT_MODE="balance-rr"
 
 hook_check_settings() {
        assert isset ADDRESS

diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index 7073cbc72a237c5094bc462479cb730c353e2f4b..2bb4977f17f7a6067e71bf06e3e1565d92fcdcdf 100644 (file)
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -27,22 +27,17 @@ HOOK_SETTINGS="ADDRESS BROADCAST_SSID CHANNEL CHANNEL_BANDWIDTH DFS MODE PHY"
 HOOK_SETTINGS="${HOOK_SETTINGS} ENCRYPTION ENVIRONMENT KEY SSID"
 HOOK_SETTINGS="${HOOK_SETTINGS} MFP"
 
-ADDRESS=$(mac_generate)
-BROADCAST_SSID=on
-CHANNEL=
-CHANNEL_BANDWIDTH=
-ENCRYPTION=""
-KEY=""
-SSID=
+# Broadcast SSID by default
+DEFAULT_BROADCAST_SSID="on"
 
 # Perform radar detection by default when possible
-DFS="on"
+DEFAULT_DFS="on"
 
 # 802.11w - Management Frame Protection
 # Disable by default because many clients cannot connect when enabled
-MFP="off"
+DEFAULT_MFP="off"
 
-ENVIRONMENT="${WIRELESS_DEFAULT_ENVIRONMENT}"
+DEFAULT_ENVIRONMENT="${WIRELESS_DEFAULT_ENVIRONMENT}"
 
 hook_check_settings() {
        assert isset ADDRESS