[src/netbsd-7]: src/etc Pull up following revision(s) (requested by jmcneill ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/79003d670713
branches:  netbsd-7
changeset: 798884:79003d670713
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Jan 23 09:47:24 2015 +0000

description:
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.

diffstat:

 etc/defaults/rc.conf    |  4 ++--
 etc/rc.d/wpa_supplicant |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r ce8fced0b415 -r 79003d670713 etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Fri Jan 23 09:37:23 2015 +0000
+++ b/etc/defaults/rc.conf      Fri Jan 23 09:47:24 2015 +0000
@@ -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 @@
 
 # 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=""
diff -r ce8fced0b415 -r 79003d670713 etc/rc.d/wpa_supplicant
--- a/etc/rc.d/wpa_supplicant   Fri Jan 23 09:37:23 2015 +0000
+++ b/etc/rc.d/wpa_supplicant   Fri Jan 23 09:47:24 2015 +0000
@@ -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 @@
     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