svn commit: r345899 - in stable/12: libexec/rc libexec/rc/rc.d tools/build/mk

[Cy Schubert]

Author: cy
Date: Fri Apr  5 01:22:30 2019
New Revision: 345899
URL: https://svnweb.freebsd.org/changeset/base/345899

Log:
  MFC r345400-345401,345403,345412,345437:
  
  Add rc.d support for ippool(8).
  
  I've been using ippool at my site for approximately two years. It's
  about time this was committed.
  
  PR:		218433

Added:
  stable/12/libexec/rc/rc.d/ippool
     - copied, changed from r345400, head/libexec/rc/rc.d/ippool
Modified:
  stable/12/libexec/rc/rc.conf
  stable/12/libexec/rc/rc.d/Makefile
  stable/12/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/rc.conf
==============================================================================
--- stable/12/libexec/rc/rc.conf	Thu Apr  4 23:40:30 2019	(r345898)
+++ stable/12/libexec/rc/rc.conf	Fri Apr  5 01:22:30 2019	(r345899)
@@ -196,6 +196,10 @@ ipfilter_program="/sbin/ipf"	# where the ipfilter prog
 ipfilter_rules="/etc/ipf.rules"	# rules definition file for ipfilter, see
 				# /usr/src/contrib/ipfilter/rules for examples
 ipfilter_flags=""		# additional flags for ipfilter
+ippool_enable="NO"		# Set to YES to enable ip filter pools
+ippool_program="/sbin/ippool"	# where the ippool program lives
+ippool_rules="/etc/ippool.tables"	# rules definition file for ippool
+ippool_flags=""			# additional flags for ippool
 ipnat_enable="NO"		# Set to YES to enable ipnat functionality
 ipnat_program="/sbin/ipnat"	# where the ipnat program lives
 ipnat_rules="/etc/ipnat.rules"	# rules definition file for ipnat

Modified: stable/12/libexec/rc/rc.d/Makefile
==============================================================================
--- stable/12/libexec/rc/rc.d/Makefile	Thu Apr  4 23:40:30 2019	(r345898)
+++ stable/12/libexec/rc/rc.d/Makefile	Fri Apr  5 01:22:30 2019	(r345899)
@@ -215,7 +215,8 @@ CONFS+=		inetd
 CONFS+=	ipfilter \
 	ipfs \
 	ipmon \
-	ipnat
+	ipnat \
+	ippool
 .endif
 
 .if ${MK_IPFW} != "no"

Copied and modified: stable/12/libexec/rc/rc.d/ippool (from r345400, head/libexec/rc/rc.d/ippool)
==============================================================================
--- head/libexec/rc/rc.d/ippool	Fri Mar 22 01:30:51 2019	(r345400, copy source)
+++ stable/12/libexec/rc/rc.d/ippool	Fri Apr  5 01:22:30 2019	(r345899)
@@ -14,26 +14,23 @@ name="ippool"
 desc="user interface to the IPFilter pools"
 rcvar="ippool_enable"
 load_rc_config $name
-start_cmd="ippool_start"
+start_precmd="ippool_start_precmd"
 stop_cmd="${ippool_program} -F"
 reload_cmd="ippool_reload"
 extra_commands="reload"
 required_files="${ippool_rules}"
 required_modules="ipl:ipfilter"
 
-ippool_start()
+ippool_start_precmd()
 {
-	if [ -r "${ippool_rules}" ]; then
-		echo "Loading IP Pools."
-		${ippool_program} -f ${ippool_rules} ${ippool_flags}
-	fi
+	rc_flags="-f ${ippool_rules} ${rc_flags}"
 }
 
 ippool_reload()
 {
 	echo "Reloading IP Pools."
-	${ippool_program} -F
-	ippool_start
+	${stop_cmd}
+	${start_cmd}
 }
 
 

Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/12/tools/build/mk/OptionalObsoleteFiles.inc	Thu Apr  4 23:40:30 2019	(r345898)
+++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc	Fri Apr  5 01:22:30 2019	(r345899)
@@ -3128,6 +3128,7 @@ OLD_FILES+=etc/rc.d/ipfilter
 OLD_FILES+=etc/rc.d/ipfs
 OLD_FILES+=etc/rc.d/ipmon
 OLD_FILES+=etc/rc.d/ipnat
+OLD_FILES+=etc/rc.d/ippool
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs