PERFORCE change 139139 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=139139

Change 139139 by sam at sam_ebb on 2008/04/01 17:12:45

	fix ability to override settings w/ environ variables

Affected files ...

.. //depot/projects/vap/tools/tools/net80211/scripts/config#4 edit

Differences ...

==== //depot/projects/vap/tools/tools/net80211/scripts/config#4 (text+ko) ====

@@ -30,17 +30,17 @@
 #CHANNEL=${1:-6:b}
 
 # default WPA passphrase
-WPA_PASSPHRASE='I am not a geek'
+test -z "$WPA_PASSPHRASE" && WPA_PASSPHRASE='I am not a geek'
 
 # default ssid for ap vaps
-SSID=freebsd-ap
+test -z "$SSID"		&& SSID=freebsd-ap
 
 # directory to create files like hostapd.conf
-TMPDIR=.
+test -z "$TMPDIR"	&& TMPDIR=.
 
-HOSTAPD_CTRL_INTERFACE=/var/run/hostapd
+test -z "$HOSTAPD_CTRL_INTERFACE" && HOSTAPD_CTRL_INTERFACE=/var/run/hostapd
 
 # applications (may want ../ for wlan test apps)
-HOSTAPD=/usr/sbin/hostapd
-WLANWATCH=/usr/local/bin/wlanwatch
-WLANWDS=/usr/local/bin/wlanwds
+test -z "$HOSTAPD"	&& HOSTAPD=/usr/sbin/hostapd
+test -z "$WLANWATCH"	&& WLANWATCH=/usr/local/bin/wlanwatch
+test -z "$WLANWDS"	&& WLANWDS=/usr/local/bin/wlanwds