From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 3 Jun 2019 09:50:13 +0000 (+0200)
Subject: hooks: Add overwritable function to determine the port name
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=commitdiff_plain;h=d673165c5456e29013def29ed1fa9f202110665a

hooks: Add overwritable function to determine the port name

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

diff --git a/src/header-port b/src/header-port
index d75fdd86..7d0b2722 100644
--- a/src/header-port
+++ b/src/header-port
@@ -68,6 +68,12 @@ hook_hotplug_rename_by_address() {
 	return ${EXIT_ERROR}
 }
 
+# Returns the suggested name of the port
+hook_find_port_name() {
+	assert isset HOOK_PORT_PATTERN
+	port_find_free "${HOOK_PORT_PATTERN}"
+}
+
 hook_default_new() {
 	local ${HOOK_SETTINGS[*]}
 
@@ -78,14 +84,16 @@ hook_default_new() {
 		return ${EXIT_ERROR}
 	fi
 
-	assert isset HOOK_PORT_PATTERN
-
-	local port=$(port_find_free ${HOOK_PORT_PATTERN})
+	# Determine a name for this port
+	local port="$(hook_find_port_name)"
 	assert isset port
 
-	port_settings_write "${port}" ${HOOK_SETTINGS[*]}
+	# Save settings
+	if ! port_settings_write "${port}" ${HOOK_SETTINGS[*]}; then
+		return ${EXIT_ERROR}
+	fi
 
-	exit ${EXIT_OK}
+	return ${EXIT_OK}
 }
 
 hook_new() {