--- trunk/initscripts/systemd/units/scripts/network.sh	2012/01/20 23:01:04	1665
+++ trunk/initscripts/systemd/units/scripts/network.sh	2013/04/02 08:27:01	2101
@@ -167,7 +167,7 @@
 		return 1
 	fi
 
-	if [ ! -x /sbin/wpa_supplicant ]
+	if [ ! -x $(type -P wpa_supplicant) ]
 	then
 		echo "WPA: wpa_supplicant not installed. Aborting setup."
 		return 1
@@ -177,7 +177,7 @@
 	[[ -f /etc/conf.d/wpa_supplicant ]] && source /etc/conf.d/wpa_supplicant
 
 	# check the configuration
-	[[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant.auto
+	[[ -z ${WIRELESS_WPA_CONFIG} ]] && WIRELESS_WPA_CONFIG=/etc/wpa_supplicant/wpa_supplicant.auto
 	[[ -z ${WIRELESS_WPA_SKEL} ]] && WIRELESS_WPA_SKEL=/etc/conf.d/wpa_supplicant.skel
 
 	# use wext as default driver, do not abort here anymore
@@ -328,7 +328,7 @@
 	fi
 
 	# first check for brctl
-	if [[ -z $(which brctl) ]]
+	if [[ -z $(type -P brctl) ]]
 	then
 		echo "brctl not found! Please install 'net-misc/bridge-utils'."
 		return 1
@@ -441,7 +441,7 @@
 		fi
 
 		# now configure wireless_extensions
-		[ -x /usr/sbin/iwconfig ] && setup_wireless_extensions "${iface}"
+		[ -x $(type -P iwconfig) ] && setup_wireless_extensions "${iface}"
 
 		# activate the interface
 		ifconfig "${iface}" up