From da620c4ec1903562ca8243ddffa7105747a64148 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 8 May 2020 08:14:56 +0200
Subject: [PATCH] rc: if we use dhcp6c rc script, we don't want it operated
 here

PR: https://github.com/opnsense/core/issues/4093
---
 src/etc/rc.freebsd                                         | 7 +++++--
 .../service/templates/OPNsense/Captiveportal/rc.conf.d     | 1 +
 src/opnsense/service/templates/OPNsense/IPFW/rc.conf.d     | 3 ++-
 src/opnsense/service/templates/OPNsense/Syslog/rc.conf.d   | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.freebsd b/src/etc/rc.freebsd
index 6c41611a6..e7b6654ce 100755
--- a/src/etc/rc.freebsd
+++ b/src/etc/rc.freebsd
@@ -69,15 +69,18 @@ rc_enabled()
 }
 
 rc_filenames="$(${RCORDER} /etc/rc.d/[a-z]* /usr/local/etc/rc.d/[a-z]* 2> /dev/null)"
+# XXX a better way would be ${name}_defer="YES" in rc.conf
 rc_filenames_defer="
 /etc/rc.d/ipfw
 /usr/local/etc/rc.d/captiveportal
 "
-rc_filenames_ignore="
+# XXX a better way would be ${name}_skip="YES" in rc.conf
+rc_filenames_skip="
+/usr/local/etc/rc.d/dhcp6c
 /usr/local/etc/rc.d/syslog-ng
 "
 
-for rc_filename in ${rc_filenames_defer} ${rc_filenames_ignore}; do
+for rc_filename in ${rc_filenames_defer} ${rc_filenames_skip}; do
 	# exclude deferred scripts from first pass, appended last instead
 	rc_filenames=$(echo "${rc_filenames}" | grep -v "^${rc_filename}$")
 done
diff --git a/src/opnsense/service/templates/OPNsense/Captiveportal/rc.conf.d b/src/opnsense/service/templates/OPNsense/Captiveportal/rc.conf.d
index c8590bcbc..ee572ebd8 100644
--- a/src/opnsense/service/templates/OPNsense/Captiveportal/rc.conf.d
+++ b/src/opnsense/service/templates/OPNsense/Captiveportal/rc.conf.d
@@ -7,4 +7,5 @@
 {%   endfor %}
 {% endif
 %}
+captiveportal_defer="YES"
 captiveportal_enable="{% if isEnabled %}YES{% else %}NO{% endif %}"
diff --git a/src/opnsense/service/templates/OPNsense/IPFW/rc.conf.d b/src/opnsense/service/templates/OPNsense/IPFW/rc.conf.d
index 13665dc36..4187621a4 100644
--- a/src/opnsense/service/templates/OPNsense/IPFW/rc.conf.d
+++ b/src/opnsense/service/templates/OPNsense/IPFW/rc.conf.d
@@ -17,6 +17,7 @@
 {%         endfor%}
 {%     endif %}
 {% endif %}
+dummynet_enable="YES"
+firewall_defer="YES"
 firewall_enable="{% if shapers or cp_zones %}YES{% else %}NO{% endif %}"
 firewall_script="/usr/local/etc/rc.ipfw"
-dummynet_enable="YES"
diff --git a/src/opnsense/service/templates/OPNsense/Syslog/rc.conf.d b/src/opnsense/service/templates/OPNsense/Syslog/rc.conf.d
index cf929c18f..761296bba 100644
--- a/src/opnsense/service/templates/OPNsense/Syslog/rc.conf.d
+++ b/src/opnsense/service/templates/OPNsense/Syslog/rc.conf.d
@@ -1,2 +1,3 @@
 syslog_ng_enable="YES"
 syslog_ng_pid="/var/run/syslog-ng.pid"
+syslog_ng_skip="YES"