From 396ce8497cb2ae7eed1e297d7edf3396759eaca1 Mon Sep 17 00:00:00 2001 From: avos Date: Sat, 26 Jan 2019 13:36:06 +0000 Subject: [PATCH] MFC r343249: Fix duplicate wpa_supplicant(8) / hostapd(8) startup with devd(8) Do not invoke 'wlan_up' function from devd(8) on interface creation event (an example to create such event: 'ifconfig wlan0 create wlandev rtwn0'); they're typically produced during 'service netif (re)start' and result in duplicate interface initialization. From the user side if WPA option is used, this result in messages like: - /etc/rc.d/wpa_supplicant: WARNING: failed to start wpa_supplicant or - wpa_supplicant already running? (pid=xxxx). (for HOSTAP interfaces this race may result in startup failure). As a side effect, wpa_supplicant(8) / hostapd(8) will not be invoked when new wlan(4) interface is created manually and corresponding configuration for it is present in rc.conf(5). This change does not affect device attach / removal events. --- etc/devd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/devd.conf b/etc/devd.conf index 5c3523f0423..30668b87149 100644 --- a/etc/devd.conf +++ b/etc/devd.conf @@ -41,7 +41,7 @@ options { # notify 0 { match "system" "IFNET"; - match "subsystem" "!usbus[0-9]+"; + match "subsystem" "(?!usbus[0-9]+|?!wlan[0-9]+)"; match "type" "ATTACH"; action "/etc/pccard_ether $subsystem start"; }; -- 2.45.0