From f20347445f491a22027288e6f69c5e3335d6b607 Mon Sep 17 00:00:00 2001 From: Dima Dorfman Date: Tue, 14 Aug 2001 05:50:19 +0000 Subject: [PATCH] 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 --- etc/rc.firewall | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/rc.firewall b/etc/rc.firewall index 4b8641b86f9d..6e96e2637c8a 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 ############