From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 21 Sep 2018 14:31:12 +0000 (+0200)
Subject: ports: Fix saving HOOK name
X-Git-Tag: 010~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8578e61dbaff42e649def2e7224d8f7347cb72a8;p=network.git

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 82945a8f..ae619aba 100644
--- 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 1a6399e8..2880a78a 100644
--- 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 30de50e9..61d2f94e 100644
--- 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 765d34db..9222bce6 100644
--- 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 2231de11..bc12a9e1 100644
--- 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 f132be64..32d1a5af 100644
--- 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 f1fc5416..4fb4dc93 100644
--- 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