From 3894d87b4a93bbb83e5699bec3107943f776144f Mon Sep 17 00:00:00 2001
From: todd <>
Date: Sun, 18 Jun 2000 19:02:28 +0000
Subject: [PATCH] rc.conf now parses ${local_rcconf} internally; closes pr 1259

---
 src/etc/netstart | 5 +----
 src/etc/rc.conf  | 4 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index caec08ca..4cf032a9 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.70 2000/05/08 21:44:39 todd Exp $
+#	$OpenBSD: netstart,v 1.71 2000/06/18 19:02:24 todd Exp $
 
 # Returns true if $1 contains only alphanumerics
 isalphanumeric() {
@@ -26,9 +26,6 @@ fi
 
 # pick up option configuration
 . /etc/rc.conf
-if [ -f $local_rcconf ]; then
-	. $local_rcconf
-fi
 
 # Configure the IP filter before configuring network interfaces
 if [ X"${ipfilter}" = X"YES" -a -f "${ipfilter_rules}" ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index f110d691..7354a99b 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.48 2000/05/30 22:20:17 mickey Exp $
+#	$OpenBSD: rc.conf,v 1.49 2000/06/18 19:02:28 todd Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=NO		# for normal use: "-q"
@@ -80,3 +80,5 @@ afsd_flags=-z			# Flags passed to afsd
 shlib_dirs=			# extra directories for ldconfig
 
 local_rcconf="/etc/rc.conf.local"
+
+[ -f ${local_rcconf} ] && . ${local_rcconf} # Do not edit this line