diff options
| author | sam <sam@FreeBSD.org> | 2008-04-08 23:12:15 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-04-08 23:12:15 +0000 |
| commit | c20bcaca65b4e3e98391498b56ef7214622bf1f6 (patch) | |
| tree | b63290a5b5f2b3d7473b31feda3a21a9684f6e68 /etc | |
| parent | e3d4b6466f639d64e83b6fc7b70ba0a5598257c2 (diff) | |
| download | FreeBSD-src-c20bcaca65b4e3e98391498b56ef7214622bf1f6.zip FreeBSD-src-c20bcaca65b4e3e98391498b56ef7214622bf1f6.tar.gz | |
o add rc.conf knobs to set the wpa_supplicant program, logging flags,
and config file
o change default logging options from -q to -s (log to syslog); this
is currently broken for boot-time startup as syslogd is started too
late but that'll be dealt with separately
MFC after: 2 weeks
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 4 | ||||
| -rw-r--r-- | etc/rc.d/wpa_supplicant | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index a470a2f..75eae06c 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -105,6 +105,10 @@ background_dhclient="NO" # Start dhcp client in the background. #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) diff --git a/etc/rc.d/wpa_supplicant b/etc/rc.d/wpa_supplicant index 044380c..7e724f0 100644 --- a/etc/rc.d/wpa_supplicant +++ b/etc/rc.d/wpa_supplicant @@ -12,8 +12,6 @@ name="wpa_supplicant" rcvar= -command="/usr/sbin/${name}" -conf_file="/etc/wpa_supplicant.conf" ifn="$2" if [ -z "$ifn" ]; then @@ -47,8 +45,10 @@ esac load_rc_config $name +command=${wpa_supplicant_program} +conf_file=${wpa_supplicant_conf_file} pidfile="/var/run/${name}/${ifn}.pid" -command_args="-B -q -i $ifn -c $conf_file -D $driver -P $pidfile" +command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile" required_files=$conf_file run_rc_command "$1" |
