PERFORCE change 139610 for review

[Sam Leffler]

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

Change 139610 by sam at 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"