Sync the code that sucks in rc.conf and friends with what's in
rc.firewall6. Specifically, don't do anything if [ -z ${source_rc_confs_defined} ]. Not doing this leads to a problem with dependencies: chkdepend will set, e.g., portmap_enable to YES if some service that needs portmap is enabled, but rc.network sources rc.firewall, which used to source defaults/rc.conf unconditionally, which would result in portmap_enable being set back to NO. PR: 29631 Submitted by: OGAWA Takaya <t-ogawa@triaez.kaisei.org>
This commit is contained in:
parent
82c38f3a43
commit
f20347445f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=81618
@ -30,11 +30,13 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Suck in the configuration variables.
|
# Suck in the configuration variables.
|
||||||
if [ -r /etc/defaults/rc.conf ]; then
|
if [ -z "${source_rc_confs_defined}" ]; then
|
||||||
. /etc/defaults/rc.conf
|
if [ -r /etc/defaults/rc.conf ]; then
|
||||||
source_rc_confs
|
. /etc/defaults/rc.conf
|
||||||
elif [ -r /etc/rc.conf ]; then
|
source_rc_confs
|
||||||
. /etc/rc.conf
|
elif [ -r /etc/rc.conf ]; then
|
||||||
|
. /etc/rc.conf
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
############
|
############
|
||||||
|
Loading…
Reference in New Issue
Block a user