Module Name: src
Committed By: martin
Date: Fri Jan 23 09:47:25 UTC 2015
Modified Files:
src/etc/defaults [netbsd-7]: rc.conf
src/etc/rc.d [netbsd-7]: wpa_supplicant
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #443):
etc/defaults/rc.conf: revision 1.129
etc/rc.d/wpa_supplicant: revision 1.6
It doesn't make sense to start wpa_supplicant from an rc.d script without
the -B flag, so always prepend it to $rc_flags.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.2.1 src/etc/defaults/rc.conf
cvs rdiff -u -r1.5 -r1.5.4.1 src/etc/rc.d/wpa_supplicant
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.123 src/etc/defaults/rc.conf:1.123.2.1
--- src/etc/defaults/rc.conf:1.123 Tue Jul 22 17:11:09 2014
+++ src/etc/defaults/rc.conf Fri Jan 23 09:47:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.123 2014/07/22 17:11:09 wiz Exp $
+# $NetBSD: rc.conf,v 1.123.2.1 2015/01/23 09:47:24 martin Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -302,7 +302,7 @@ iscsi_target=NO iscsi_target_flags=""
# WPA daemons.
hostapd=NO hostapd_flags="-B /etc/hostapd.conf"
-wpa_supplicant=NO wpa_supplicant_flags="-B" # -i<if> -c<file>
+wpa_supplicant=NO wpa_supplicant_flags="" # -i<if> -c<file>
# ISDN daemon
isdnd=NO isdnd_flags=""
Index: src/etc/rc.d/wpa_supplicant
diff -u src/etc/rc.d/wpa_supplicant:1.5 src/etc/rc.d/wpa_supplicant:1.5.4.1
--- src/etc/rc.d/wpa_supplicant:1.5 Thu Jan 23 07:26:51 2014
+++ src/etc/rc.d/wpa_supplicant Fri Jan 23 09:47:25 2015
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: wpa_supplicant,v 1.5 2014/01/23 07:26:51 spz Exp $
+# $NetBSD: wpa_supplicant,v 1.5.4.1 2015/01/23 09:47:25 martin Exp $
#
# PROVIDE: wpa_supplicant
@@ -29,6 +29,7 @@ wpa_supplicant_precmd()
if [ ! -d /var/run/wpa_supplicant ]; then
mkdir -p -m 755 /var/run/wpa_supplicant
fi
+ rc_flags="-B $rc_flags"
}
load_rc_config $name
