ports: Fix saving HOOK name

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

diff --git a/src/functions/functions.ports b/src/functions/functions.ports
index 82945a8f27dff979c7a9d8dafc3e13daf150afeb..ae619ababaa155729aeba28a3dc4676ad55a4020 100644 (file)
--- a/src/functions/functions.ports
+++ b/src/functions/functions.ports
@@ -90,7 +90,7 @@ port_settings_write() {
        if function_exists "hook_check_settings"; then
                list_append args "--check=\"hook_check_settings\""
        fi
-       list_append args ${HOOK_SETTINGS}
+       list_append args HOOK ${HOOK_SETTINGS}
 
        settings_write "$(port_file "${port}")" ${args}
 }

diff --git a/src/hooks/ports/bonding b/src/hooks/ports/bonding
index 1a6399e818ad1ad42e9031bcd632e581107e2ca3..2880a78a370f94251af9b353758aa45ee3a15f94 100644 (file)
--- a/src/hooks/ports/bonding
+++ b/src/hooks/ports/bonding
@@ -21,7 +21,7 @@
 
 . /usr/lib/network/header-port
 
-HOOK_SETTINGS="HOOK ADDRESS MIIMON MODE OFFLOADING SLAVES"
+HOOK_SETTINGS="ADDRESS MIIMON MODE OFFLOADING SLAVES"
 
 SLAVES=""
 MIIMON=100

diff --git a/src/hooks/ports/dummy b/src/hooks/ports/dummy
index 30de50e99e781e4442cf2794673021fbd0f4e915..61d2f94ee9d6c1e01e7d03204237136ac8697418 100644 (file)
--- a/src/hooks/ports/dummy
+++ b/src/hooks/ports/dummy
@@ -21,7 +21,7 @@
 
 . /usr/lib/network/header-port
 
-HOOK_SETTINGS="HOOK ADDRESS"
+HOOK_SETTINGS="ADDRESS"
 
 hook_check_settings() {
        assert ismac ADDRESS

diff --git a/src/hooks/ports/ethernet b/src/hooks/ports/ethernet
index 765d34db3e7cd5ded6408042b8921f17ff55aa9e..9222bce65a5ee60d769b08ca1cdf664c89c5492d 100644 (file)
--- a/src/hooks/ports/ethernet
+++ b/src/hooks/ports/ethernet
@@ -24,7 +24,7 @@
 # DEVICE equals the actual MAC address of the device.
 # If ADDRESS is set, the device will get ADDRESS set for its MAC address.
 
-HOOK_SETTINGS="HOOK ADDRESS ADVERTISED_LINK_SPEEDS DEVICE OFFLOADING MTU"
+HOOK_SETTINGS="ADDRESS ADVERTISED_LINK_SPEEDS DEVICE OFFLOADING MTU"
 
 hook_check_settings() {
        assert ismac DEVICE

diff --git a/src/hooks/ports/vlan b/src/hooks/ports/vlan
index 2231de116ba84fd08abcc86d8acae4927110b314..bc12a9e11a8eec5815c9684206c1cd0e9e53761a 100644 (file)
--- a/src/hooks/ports/vlan
+++ b/src/hooks/ports/vlan
@@ -21,7 +21,7 @@
 
 . /usr/lib/network/header-port
 
-HOOK_SETTINGS="HOOK ADDRESS PARENT_DEVICE TAG"
+HOOK_SETTINGS="ADDRESS PARENT_DEVICE TAG"
 
 PORT_PARENTS_VAR="PARENT"
 

diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index f132be6488d14e1521c15eddb01ef845b7df40f3..32d1a5afc167fc56e7a02aa02082d38b9a568284 100644 (file)
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -23,7 +23,7 @@
 
 HOOK_PORT_PATTERN="${PORT_PATTERN_ACCESSPOINT}"
 
-HOOK_SETTINGS="HOOK ADDRESS BROADCAST_SSID CHANNEL MODE PHY SSID"
+HOOK_SETTINGS="ADDRESS BROADCAST_SSID CHANNEL MODE PHY SSID"
 HOOK_SETTINGS="${HOOK_SETTINGS} ENCRYPTION KEY"
 
 ADDRESS=$(mac_generate)
@@ -94,6 +94,11 @@ hook_parse_cmdline() {
                shift
        done
 
+       # Generate a random MAC address if none is set
+       if ! isset ADDRESS; then
+               ADDRESS="$(mac_generate)"
+       fi
+
        # MODE must be set
        if ! isset MODE; then
                error "--mode is not set"

diff --git a/src/hooks/ports/wireless-mesh b/src/hooks/ports/wireless-mesh
index f1fc54166ba3107189720b11405ab5d01c4cc66d..4fb4dc93a2376a252f4973f733e5c356032a648c 100644 (file)
--- a/src/hooks/ports/wireless-mesh
+++ b/src/hooks/ports/wireless-mesh
@@ -23,7 +23,7 @@
 
 HOOK_PORT_PATTERN="${PORT_PATTERN_MESH}"
 
-HOOK_SETTINGS="HOOK ADDRESS MESH_ID CHANNEL PHY PSK"
+HOOK_SETTINGS="ADDRESS MESH_ID CHANNEL PHY PSK"
 
 hook_check_settings() {
        assert ismac ADDRESS