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 f3e3f9fdf9baade9c92284e17318b424671fd0ad..82664fa15376198d712e1fed7267d0025a2d21be 100644 (file)
--- a/src/hooks/ports/ethernet
+++ b/src/hooks/ports/ethernet
@@ -117,7 +117,7 @@ hook_new() {
 
        local DEVICE="$(device_get_address "${device}")"
 
 
        local DEVICE="$(device_get_address "${device}")"
 

-       if ! port_settings_write "${port}" ${HOOK_SETTINGS[*]}; then
+       if ! port_settings_write "${port}"; then

                log ERROR "Could not write settings for port ${port}"
                return ${EXIT_ERROR}
        fi
                log ERROR "Could not write settings for port ${port}"
                return ${EXIT_ERROR}
        fi


@@ -133,7 +133,7 @@ hook_up() {
        local port="${1}"
 
        local ${HOOK_SETTINGS[*]}
        local port="${1}"
 
        local ${HOOK_SETTINGS[*]}

-       if ! port_settings_read "${port}" ${HOOK_SETTINGS[*]}; then
+       if ! port_settings_read "${port}"; then

                log ERROR "Could not read settings for port ${port}"
                return ${EXIT_ERROR}
        fi
                log ERROR "Could not read settings for port ${port}"
                return ${EXIT_ERROR}
        fi


@@ -173,25 +173,5 @@ hook_remove() {
 }
 
 hook_hotplug_rename() {
 }
 
 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 "$@"

 }
 }