Move all port patterns into functions.constants.

diff --git a/functions.constants b/functions.constants
index 40f306df2593e04ae75e737a319d3f71ca315a7a..52f35649df0b17857d92047cf21ee50b56582df3 100644 (file)
--- a/functions.constants
+++ b/functions.constants
@@ -80,3 +80,5 @@ TIMEOUT_RESTART=2
 DEVICE_PRINT_LINE1="    %-24s %s\n"
 
 PORT_PATTERN="pN"
+PORT_PATTERN_ACCESSPOINT="apN"
+PORT_PATTERN_WIRELESS="wN"

diff --git a/hooks/ports/wireless-ap b/hooks/ports/wireless-ap
index 5e4f86b02140eb7368d479b904ea7be8aecaedbf..b98e3e70d450380f29e4dc576c93ce59ad9d82cc 100755 (executable)
--- a/hooks/ports/wireless-ap
+++ b/hooks/ports/wireless-ap
@@ -19,9 +19,7 @@
 #                                                                             #
 ###############################################################################
 
-. /lib/network/header-port
-
-DEVICE_PATTERN="apN"
+. /usr/lib/network/header-port
 
 HOOK_SETTINGS="HOOK ADDRESS BROADCAST_SSID CHANNEL COUNTRY_CODE MODE PHY SSID"
 
@@ -81,7 +79,7 @@ function _create() {
        PHY=$(phy_get ${PHY})
        PHY=$(phy_get_address ${PHY})
 
-       local port=$(port_find_free ${DEVICE_PATTERN})
+       local port=$(port_find_free ${PORT_PATTERN_ACCESSPOINT})
        assert isset port
 
        config_write $(port_file ${port}) ${HOOK_SETTINGS}