From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 19:14:39 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 462E31065673; Tue,  8 Apr 2008 19:14:39 +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 04870106564A
	for <perforce@freebsd.org>; Tue,  8 Apr 2008 19:14:39 +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 E73968FC1D
	for <perforce@freebsd.org>; Tue,  8 Apr 2008 19:14:38 +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 m38JEcd6075813
	for <perforce@freebsd.org>; Tue, 8 Apr 2008 19:14:38 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38JEcZ1075811
	for perforce@freebsd.org; Tue, 8 Apr 2008 19:14:38 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 8 Apr 2008 19:14:38 GMT
Message-Id: <200804081914.m38JEcZ1075811@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 139610 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, 08 Apr 2008 19:14:39 -0000

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

Change 139610 by sam@sam_ebb on 2008/04/08 19:14:37

	o split wpa_supplicant config out into separate variables so
	  people can run a version out of ports, stick the config file
	  anywhere they want, and control logging
	o change default options to -s so we log to syslog (noop at
	  boot until we fix the bogosity there)

Affected files ...

.. //depot/projects/vap/etc/defaults/rc.conf#8 edit
.. //depot/projects/vap/etc/rc.d/wpa_supplicant#4 edit

Differences ...

==== //depot/projects/vap/etc/defaults/rc.conf#8 (text+ko) ====

@@ -105,6 +105,10 @@
 #background_dhclient_fxp0="YES"	# Start dhcp client on fxp0 in the background.
 synchronous_dhclient="YES"	# Start dhclient directly on configured
 				# interfaces during startup.
+wpa_supplicant_program="/usr/sbin/wpa_supplicant"
+wpa_supplicant_flags="-s"	# Extra flags to pass to wpa_supplicant
+wpa_supplicant_conf_file="/etc/wpa_supplicant.conf"
+#
 firewall_enable="NO"		# Set to YES to enable firewall functionality
 firewall_script="/etc/rc.firewall" # Which script to run to set up the firewall
 firewall_type="UNKNOWN"		# Firewall type (see /etc/rc.firewall)

==== //depot/projects/vap/etc/rc.d/wpa_supplicant#4 (text+ko) ====

@@ -12,8 +12,6 @@
 
 name="wpa_supplicant"
 rcvar=
-command="/usr/sbin/${name}"
-conf_file="/etc/wpa_supplicant.conf"
 
 ifn="$2"
 if [ -z "$ifn" ]; then
@@ -40,8 +38,10 @@
 
 load_rc_config $name
 
-pid_file="/var/run/${name}/${ifn}.pid"
-command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pid_file"
+command=${wpa_supplicant_program}
+conf_file=${wpa_supplicant_conf_file}
+pidfile="/var/run/${name}/${ifn}.pid"
+command_args="-B ${wpa_supplicant_flags} -i $ifn -c $conf_file -D $driver -P $pidfile"
 required_files=$conf_file
 
 run_rc_command "$1"