mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-15 17:14:46 +00:00
rc: if we use dhcp6c rc script, we don't want it operated here
PR: https://github.com/opnsense/core/issues/4093
This commit is contained in:
parent
fe32660338
commit
da620c4ec1
@ -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
|
||||
|
||||
@ -7,4 +7,5 @@
|
||||
{% endfor %}
|
||||
{% endif
|
||||
%}
|
||||
captiveportal_defer="YES"
|
||||
captiveportal_enable="{% if isEnabled %}YES{% else %}NO{% endif %}"
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
syslog_ng_enable="YES"
|
||||
syslog_ng_pid="/var/run/syslog-ng.pid"
|
||||
syslog_ng_skip="YES"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user