hotplug: Remove multiple copies of the same function

[people/ms/network.git] / src / hooks / ports / ethernet

diff --git a/src/hooks/ports/ethernet b/src/hooks/ports/ethernet
index 9222bce65a5ee60d769b08ca1cdf664c89c5492d..82664fa15376198d712e1fed7267d0025a2d21be 100644 (file)
--- a/src/hooks/ports/ethernet
+++ b/src/hooks/ports/ethernet
@@ -21,14 +21,20 @@
 
 . /usr/lib/network/header-port
 
-# 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="ADDRESS ADVERTISED_LINK_SPEEDS DEVICE OFFLOADING MTU"
+HOOK_SETTINGS=(
+       "ADDRESS"
+       "ADVERTISED_LINK_SPEEDS"
+       "DEVICE"
+       "OFFLOADING"
+       "MTU"
+)
 
 hook_check_settings() {
        assert ismac DEVICE
 
+       # Invalid MAC addresses are not allowed
+       assert not isoneof DEVICE 00:00:00:00:00:00 ff:ff:ff:ff:ff:ff
+
        if isset ADDRESS; then
                assert ismac ADDRESS
        fi
@@ -100,6 +106,25 @@ hook_parse_cmdline() {
        done
 }
 
+# This function is only called automatically by hotplug to create
+# a new ethernet port.
+hook_new() {
+       local port="${1}"
+       assert isset port
+
+       local device="${2}"
+       assert isset device
+
+       local DEVICE="$(device_get_address "${device}")"
+
+       if ! port_settings_write "${port}"; then
+               log ERROR "Could not write settings for port ${port}"
+               return ${EXIT_ERROR}
+       fi
+
+       return ${EXIT_OK}
+}
+
 hook_create() {
        return ${EXIT_OK}
 }
@@ -107,8 +132,8 @@ hook_create() {
 hook_up() {
        local port="${1}"
 
-       local ${HOOK_SETTINGS}
-       if ! port_settings_read "${port}" ${HOOK_SETTINGS}; then
+       local ${HOOK_SETTINGS[*]}
+       if ! port_settings_read "${port}"; then
                log ERROR "Could not read settings for port ${port}"
                return ${EXIT_ERROR}
        fi
@@ -148,25 +173,5 @@ hook_remove() {
 }
 
 hook_hotplug_rename() {
-       local port=${1}
-       assert isset port
-
-       local device=${2}
-       assert isset device
-
-       # Read in the conifguration file.
-       port_settings_read "${port}" ${HOOK_SETTINGS}
-
-       # Get the current MAC address of the device.
-       local address=$(device_get_address ${device})
-       assert isset address
-
-       # Check if the address matches with the configuration.
-       if list_match "${address}" ${DEVICE} ${ADDRESS}; then
-               log DEBUG "Device '${device}' equals port '${port}'."
-               exit ${EXIT_OK}
-       fi
-
-       log DEBUG "Device '${device}' does not equal port '${port}'."
-       exit ${EXIT_ERROR}
+       hook_hotplug_rename_by_address "$@"
 }