From bc2bc040691ccd95f1c120e9a2a7cbcf69bcb9fe Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 22 Mar 1999 19:58:29 +0000
Subject: *** empty log message ***

---
 ChangeLog        | 4 ++++
 initscripts.spec | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aa439d36..fb547c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-03-22  Bill Nottingham  <notting@redhat.com>
+
+	* rc.d/init.d/functions: if $BOOTUP is already set, don't source config
+
 1999-03-19  Bill Nottingham  <notting@redhat.com>
 
 	* sysconfig/network-scripts/ifup-aliases, sysconfig/network-scripts/ifup-routes:
diff --git a/initscripts.spec b/initscripts.spec
index 7487a3af..39945554 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -4,7 +4,7 @@ Name: initscripts
 Version: %{version}
 Copyright: GPL
 Group: System Environment/Base
-Release: 5
+Release: 6
 Source: initscripts-%{version}.tar.gz
 BuildRoot: /var/tmp/initbld
 Requires: mingetty, bash, /bin/awk, mktemp, modutils >= 2.1.85-3, e2fsprogs, sysklogd >= 1.3.31, pump
@@ -168,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc sysconfig.txt
 
 %changelog
+* Mon Mar 22 1999 Bill Nottingham <notting@redhat.com>
+- don't source /etc/sysconfig/init if $BOOTUP is already set
+
 * Fri Mar 19 1999 Bill Nottingham <notting@redhat.com>
 - don't run linuxconf if /usr isn't mounted
 - set macaddr before bootp
-- 
cgit v1.2.1