From df23259f18e1eba7404267db031c1793d80a1cec Mon Sep 17 00:00:00 2001
From: rpe <>
Date: Sun, 19 Jul 2015 19:52:36 +0000
Subject: [PATCH] Always source rc.subr to be able to use the rc.conf parsing
 routine to get the network related vars from rc.conf. This is even necessary
 if netstart is run from within /etc/rc. Remove test of $INRC which
 unintentionally evaluated always to true.

problem with previous change found by nigel@
OK sthen@ aja@ halex@
---
 src/etc/netstart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/etc/netstart b/src/etc/netstart
index c1785c2e..68994778 100644
--- a/src/etc/netstart
+++ b/src/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: netstart,v 1.150 2015/07/19 14:17:21 ajacoutot Exp $
+#	$OpenBSD: netstart,v 1.151 2015/07/19 19:52:36 rpe Exp $
 
 # Strip comments (and leading/trailing whitespace if IFS is set) from a file
 # and spew to stdout.
@@ -148,8 +148,8 @@ ifmstart() {
 	done
 }
 
-# Re-read rc.subr if we are not inside /etc/rc.
-[ -n ${INRC} ] && FUNCS_ONLY=1 . /etc/rc.d/rc.subr
+# Get network related vars from rc.conf using the parsing routine from rc.subr.
+FUNCS_ONLY=1 . /etc/rc.d/rc.subr
 _rc_parse_conf
 
 # If we were invoked with a list of interface names, just reconfigure these