Add wpa_supplicant_driver option for nl80211 users.

diff --git a/dhcpcd-hooks/10-wpa_supplicant b/dhcpcd-hooks/10-wpa_supplicant
index 716bd315898138894eb314ff8825565dd4bdeb9f..9eec0c1f170e1435f838ddd64a3d93f7f7b84c5f 100644 (file)
--- a/dhcpcd-hooks/10-wpa_supplicant
+++ b/dhcpcd-hooks/10-wpa_supplicant
@@ -59,7 +59,9 @@ wpa_supplicant_start()
 
        wpa_cli -p "$dir" -i "$interface" status >/dev/null 2>&1 && return 0
        syslog info "starting wpa_supplicant"
-       err=$(wpa_supplicant -B -c"$wpa_supplicant_conf" -i"$interface" 2>&1)
+       driver=${wpa_supplicant_driver:+-D}$wpa_supplicant_driver
+       err=$(wpa_supplicant -B -c"$wpa_supplicant_conf" -i"$interface" \
+           "$driver" 2>&1)
        errn=$?
        if [ $errn != 0 ]; then
                syslog err "failed to start wpa_supplicant"

diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index cc10a16ab923580f6aca7dcece69ab135aecb4f3..df63b4e8abf7bb82257cb6082bd5d87980bf9f4f 100644 (file)
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 7, 2014
+.Dd September 14, 2014
 .Dt DHCPCD.CONF 5
 .Os
 .Sh NAME
@@ -139,6 +139,11 @@ to the environment for use in
 For example, you can force the hostname hook to always set the hostname with
 .Ic env
 .Va force_hostname=YES .
+Or set which driver
+.Xr wpa_supplicant 8
+should use with
+.Ic env
+.Va wpa_supplicant_driver=nl80211
 .Pp
 If the hostname is set, will be will set to the FQDN if possible as per
 RFC 4702 section 3.1.