From: Roy Marples <roy@marples.name>
Date: Sat, 21 Sep 2013 14:47:17 +0000 (+0000)
Subject: Test for wpa_supplicant.conf in /etc/wpa_supplicant as well
X-Git-Tag: v6.2.0~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66deb40ff9adc0bac8148994effd2701f7a2dca2;p=thirdparty%2Fdhcpcd.git

Test for wpa_supplicant.conf in /etc/wpa_supplicant as well
---

diff --git a/dhcpcd-hooks/10-wpa_supplicant b/dhcpcd-hooks/10-wpa_supplicant
index af429d00..8e065789 100644
--- a/dhcpcd-hooks/10-wpa_supplicant
+++ b/dhcpcd-hooks/10-wpa_supplicant
@@ -3,6 +3,17 @@
 # and the user should not be expected to have to wire it into their system
 # if the base system doesn't do this itself.
 
+if [ -z "$wpa_supplicant_conf" ]; then
+	for x in \
+		/etc/wpa_supplicant.conf \
+		/etc/wpa_supplicant/wpa_supplicant.conf \
+	; do
+		if [ -s "$x" ]; then
+			wpa_supplicant_conf="$x"
+			break
+		fi
+	done
+fi
 : ${wpa_supplicant_conf:=/etc/wpa_supplicant.conf}
 
 wpa_supplicant_start()