From owner-p4-projects@FreeBSD.ORG  Tue Apr  1 17:13:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2519D1065675; Tue,  1 Apr 2008 17:13:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D81731065673
	for <perforce@freebsd.org>; Tue,  1 Apr 2008 17:13:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C69328FC14
	for <perforce@freebsd.org>; Tue,  1 Apr 2008 17:13:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m31HDVlJ089106
	for <perforce@freebsd.org>; Tue, 1 Apr 2008 17:13:31 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m31HDV6O089104
	for perforce@freebsd.org; Tue, 1 Apr 2008 17:13:31 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 1 Apr 2008 17:13:31 GMT
Message-Id: <200804011713.m31HDV6O089104@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139139 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2008 17:13:32 -0000

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

Change 139139 by sam@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