Date: Fri, 30 Nov 2018 06:47:01 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r341289 - stable/10/etc/rc.d Message-ID: <201811300647.wAU6l1Si071846@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Fri Nov 30 06:47:01 2018 New Revision: 341289 URL: https://svnweb.freebsd.org/changeset/base/341289 Log: This is a direct commit to the stable/10 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. Modified: stable/10/etc/rc.d/ipmon Modified: stable/10/etc/rc.d/ipmon ============================================================================== --- stable/10/etc/rc.d/ipmon Fri Nov 30 06:45:53 2018 (r341288) +++ stable/10/etc/rc.d/ipmon Fri Nov 30 06:47:01 2018 (r341289) @@ -20,7 +20,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811300647.wAU6l1Si071846>