From ef29c39088966d5c526a5b8bc2e75bbfd0ed660d Mon Sep 17 00:00:00 2001 From: cy Date: Fri, 30 Nov 2018 06:45:53 +0000 Subject: [PATCH] This is a direct commit to the stable/11 branch. This would have been MFC r340754 except that etc/rc.d has been moved in HEAD which would have resulted in a tree conflict if merged. Allow forced start of ipmon in special cases where testing is desired (or other special cases) and when ipfilter is disabled in rc.conf but started by other means. --- etc/rc.d/ipmon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon index 129bdda157f..17d46b1a66f 100755 --- a/etc/rc.d/ipmon +++ b/etc/rc.d/ipmon @@ -21,7 +21,7 @@ ipmon_precmd() # Continue only if ipfilter or ipnat is enabled and the # ipfilter module is loaded. # - if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable ; then + if ! checkyesno ipfilter_enable && ! checkyesno ipnat_enable && ! checkyesno rc_force ; then err 1 "${name} requires either ipfilter or ipnat enabled" fi if ! ${ipfilter_program:-/sbin/ipf} -V | grep -q 'Running: yes' >/dev/null 2>&1; then -- 2.45.0