[src/trunk]: src/etc It doesn't make sense to start wpa_supplicant from an rc...

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

details:   https://anonhg.NetBSD.org/src/rev/b33a2c1df2d4
branches:  trunk
changeset: 805889:b33a2c1df2d4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Thu Jan 22 19:50:21 2015 +0000

description:
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 a4e89880eb87 -r b33a2c1df2d4 etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Thu Jan 22 19:44:59 2015 +0000
+++ b/etc/defaults/rc.conf      Thu Jan 22 19:50:21 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: rc.conf,v 1.128 2014/09/26 11:04:06 tron Exp $
+#      $NetBSD: rc.conf,v 1.129 2015/01/22 19:50:21 jmcneill Exp $
 #
 # /etc/defaults/rc.conf --
 #      default configuration of /etc/rc.conf
@@ -300,7 +300,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 a4e89880eb87 -r b33a2c1df2d4 etc/rc.d/wpa_supplicant
--- a/etc/rc.d/wpa_supplicant   Thu Jan 22 19:44:59 2015 +0000
+++ b/etc/rc.d/wpa_supplicant   Thu Jan 22 19:50:21 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.6 2015/01/22 19:50:21 jmcneill 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