[arch-projects] [netcfg] [PATCH 2/2] auto-wireless: Respect interface specific configuration when no profile is found

[Thomas Bächler]

When we connect to a wireless network that does not match any profile, we call
dhcpcd. Until now, we did not respect /etc/network.d/interfaces/$interface and
the dhcp options set there. This patch calls dhcpcd with the same options as
$CONN_DIR/ethernet and respects the interface specific options.
---
 scripts/netcfg-wpa_actiond-action |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/netcfg-wpa_actiond-action b/scripts/netcfg-wpa_actiond-action
index 71ffcf7..1f29364 100755
--- a/scripts/netcfg-wpa_actiond-action
+++ b/scripts/netcfg-wpa_actiond-action
@@ -11,7 +11,9 @@ action="$4"
 case $action in
     CONNECT)
         if [[ -z $profile ]]; then
-            dhcpcd -K "$interface"
+            # Load interface specific config
+            [[ -f "$IFACE_DIR/$interface" ]] && source "$IFACE_DIR/$interface"
+            dhcpcd -qL -t "${DHCP_TIMEOUT:-10}" -K $DHCP_OPTIONS "$interface"
             exit $?
         fi
         if ! DHCPCD_INTERNAL_OPTIONS="-K" $CONN_DIR/ethernet up "$profile"; then
-- 
1.7.9.4