diff options
| author | dd <dd@FreeBSD.org> | 2001-08-14 05:50:19 +0000 |
|---|---|---|
| committer | dd <dd@FreeBSD.org> | 2001-08-14 05:50:19 +0000 |
| commit | 9b57f556f59d313fcd04ad78cd03980921679797 (patch) | |
| tree | a07227ddf4565f0b1228a017cd7cc11973d3d2e7 | |
| parent | e7117469c52c4ea38f89693e6b6d8924027d5c21 (diff) | |
| download | FreeBSD-src-9b57f556f59d313fcd04ad78cd03980921679797.zip FreeBSD-src-9b57f556f59d313fcd04ad78cd03980921679797.tar.gz | |
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>
| -rw-r--r-- | etc/rc.firewall | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/etc/rc.firewall b/etc/rc.firewall index 4b8641b..6e96e26 100644 --- a/etc/rc.firewall +++ b/etc/rc.firewall @@ -30,11 +30,13 @@ # # Suck in the configuration variables. -if [ -r /etc/defaults/rc.conf ]; then - . /etc/defaults/rc.conf - source_rc_confs -elif [ -r /etc/rc.conf ]; then - . /etc/rc.conf +if [ -z "${source_rc_confs_defined}" ]; then + if [ -r /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf + source_rc_confs + elif [ -r /etc/rc.conf ]; then + . /etc/rc.conf + fi fi ############ |
