svn commit: r349651 - in stable/12/libexec/rc: . rc.d

[Cy Schubert]

Author: cy
Date: Wed Jul  3 16:43:40 2019
New Revision: 349651
URL: https://svnweb.freebsd.org/changeset/base/349651

Log:
  MFC r349153:
  
  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

Modified:
  stable/12/libexec/rc/rc.conf
  stable/12/libexec/rc/rc.d/hostapd
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/rc.conf
==============================================================================
--- stable/12/libexec/rc/rc.conf	Wed Jul  3 16:23:06 2019	(r349650)
+++ stable/12/libexec/rc/rc.conf	Wed Jul  3 16:43:40 2019	(r349651)
@@ -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: stable/12/libexec/rc/rc.d/hostapd
==============================================================================
--- stable/12/libexec/rc/rc.d/hostapd	Wed Jul  3 16:23:06 2019	(r349650)
+++ stable/12/libexec/rc/rc.d/hostapd	Wed Jul  3 16:43:40 2019	(r349651)
@@ -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