From c37cc5e191d567fe04506549ff2e4fa3f06870ad Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Wed, 28 Apr 2004 13:20:15 +0000
Subject: Protect som cross-script invocations by checks to see that the target
 script exists.  This allows pruning of rc.d scripts without getting too many
 ugly boottime error message

---
 etc/rc.d/ipfw  | 8 ++++++--
 etc/rc.d/netif | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'etc')

diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw
index 990c14e..2e8100c 100644
--- a/etc/rc.d/ipfw
+++ b/etc/rc.d/ipfw
@@ -37,7 +37,9 @@ ipfw_start()
 	if [ -r "${firewall_script}" ]; then
 		. "${firewall_script}"
 		echo -n 'Firewall rules loaded, starting divert daemons:'
-		/etc/rc.d/natd start
+		if [ -f /etc/rc.d/natd ] ; then
+			/etc/rc.d/natd start
+		fi
 	elif [ "`ipfw l 65535`" = "65535 deny ip from any to any" ]; then
 		echo 'Warning: kernel has firewall functionality, but' \
 		    ' firewall rules are not enabled.'
@@ -62,7 +64,9 @@ ipfw_stop()
 	# Disable the firewall
 	#
 	${SYSCTL_W} net.inet.ip.fw.enable=0
-	/etc/rc.d/natd stop
+	if [ -f /etc/rc.d/natd ] ; then
+		/etc/rc.d/natd stop
+	fi
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index 44d06f9..42a35b0 100644
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -57,8 +57,10 @@ network_start()
 	# Configure the interface(s).
 	network_common ifn_start verbose
 
-	# Resync ipfilter
-	/etc/rc.d/ipfilter resync
+	if [ -f /etc/rc.d/ipfilter ] ; then
+		# Resync ipfilter
+		/etc/rc.d/ipfilter resync
+	fi
 }
 
 network_stop()
-- 
cgit v1.1