From 78298ce633a7dae3afdb5117815526f4349ffff4 Mon Sep 17 00:00:00 2001
From: grant <grant>
Date: Sun, 6 Jul 2003 20:40:34 +0000
Subject: update to 20030706. sync with -current:

----------------------------
revision 1.59
date: 2003/07/04 14:14:10;  author: lukem;  state: Exp;  lines: +1 -7
Revert previous; the "return" if rc.subr had already loaded had issues
in some circumstances where run_rc_script()'s sourcing of an rc.d file
which then sourced rc.subr, the `optimisation' in rc.subr to "return as
we're already loaded" would finish more than just the inner-most sourcing.
I haven't tracked down the exact issue, but removing the `optimisation'
fixes the problem I noticed in starting up certain rc.d scripts, and
may fix [bin/22053] as well.
---
 pkgtools/rc.subr/Makefile      | 4 ++--
 pkgtools/rc.subr/files/rc.subr | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/rc.subr/Makefile b/pkgtools/rc.subr/Makefile
index 4cee53789d9..446d0030a70 100644
--- a/pkgtools/rc.subr/Makefile
+++ b/pkgtools/rc.subr/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/06/28 07:15:27 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/07/06 20:40:35 grant Exp $
 #
 
-DISTNAME=		rc.subr-20030627
+DISTNAME=		rc.subr-20030706
 CATEGORIES=		pkgtools
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/pkgtools/rc.subr/files/rc.subr b/pkgtools/rc.subr/files/rc.subr
index a8b496474ab..6dc5038fcaf 100644
--- a/pkgtools/rc.subr/files/rc.subr
+++ b/pkgtools/rc.subr/files/rc.subr
@@ -1,4 +1,4 @@
-# $NetBSD: rc.subr,v 1.3 2003/06/28 07:15:28 grant Exp $
+# $NetBSD: rc.subr,v 1.4 2003/07/06 20:40:34 grant Exp $
 #
 # Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -38,12 +38,6 @@
 #	functions used by various rc scripts
 #
 
-if ${_rc_subr_loaded:-false}; then
-	return
-else
-	_rc_subr_loaded=true
-fi
-
 #	global variables
 #	----------------
 
-- 
cgit v1.2.3