From ff4f8c661933928c6cf17e5ba16d9515310c0b6a Mon Sep 17 00:00:00 2001
From: ajacoutot <>
Date: Mon, 27 Dec 2010 14:49:05 +0000
Subject: [PATCH] There is no point in calling rc_conf manually from each and
 every rc script; instead, rc.subr can call rc_conf itself right after reading
 in rc.conf.

from schwarze@ (committing on his behalf)
ok robert@
---
 src/etc/rc.d/rc.subr | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr
index cab274d6..1a0f46fc 100644
--- a/src/etc/rc.d/rc.subr
+++ b/src/etc/rc.d/rc.subr
@@ -1,6 +1,4 @@
-#	$OpenBSD: rc.subr,v 1.15 2010/12/24 10:37:24 ajacoutot Exp $
-
-[ -z "${local_rcconf}" ] && . /etc/rc.conf
+#	$OpenBSD: rc.subr,v 1.16 2010/12/27 14:49:05 ajacoutot Exp $
 
 rc_err() {
 	echo $1
@@ -80,3 +78,6 @@ rc_cmd() {
 		rc_err "usage: $0 {start|check|reload|restart|stop}"
 	esac
 }
+
+[ -z "${local_rcconf}" ] && . /etc/rc.conf
+rc_conf