svn commit: r349153 - in head/libexec/rc: . rc.d

[Cy Schubert]

Author: cy
Date: Mon Jun 17 20:11:02 2019
New Revision: 349153
URL: https://svnweb.freebsd.org/changeset/base/349153

Log:
  Allow the hostapd program to be specified. This allows users to use
  hostapd from ports instead of the one in base. The default is the hostapd
  in base.
  
  PR:		238571
  MFC after:	1 week

Modified:
  head/libexec/rc/rc.conf
  head/libexec/rc/rc.d/hostapd

Modified: head/libexec/rc/rc.conf
==============================================================================
--- head/libexec/rc/rc.conf	Mon Jun 17 20:10:55 2019	(r349152)
+++ head/libexec/rc/rc.conf	Mon Jun 17 20:11:02 2019	(r349153)
@@ -275,6 +275,7 @@ ppp_user="root"		# Which user to run ppp as
 # profile3 uses default ppp_mode and ppp_nat
 
 ### Network daemon (miscellaneous) ###
+hostapd_program="/usr/sbin/hostapd"
 hostapd_enable="NO"		# Run hostap daemon.
 syslogd_enable="YES"		# Run syslog daemon (or NO).
 syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.

Modified: head/libexec/rc/rc.d/hostapd
==============================================================================
--- head/libexec/rc/rc.d/hostapd	Mon Jun 17 20:10:55 2019	(r349152)
+++ head/libexec/rc/rc.d/hostapd	Mon Jun 17 20:11:02 2019	(r349153)
@@ -11,7 +11,7 @@
 
 name="hostapd"
 desc="Authenticator for IEEE 802.11 networks"
-command="/usr/sbin/${name}"
+command=${hostapd_program}
 
 ifn="$2"
 if [ -z "$ifn" ]; then