revert

15 files changed, 23 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index f2b1f157..c5f893a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2000-07-24  Bernhard Rosenkraenzer  <bero@redhat.com>
-	* service, sysvinitfiles, rc.d/rc, rc.d/rc.sysinit,
-	  rc.d/init.d/functions, rc.d/init.d/halt, rc.d/init.d/killall,
-	  rc.d/init.d/netfs, rc.d/init.d/network, rc.d/init.d/single,
-	  src/Makefile src/testdinit
-	/etc/init.d -> /etc/rc.d/init.d
-
 2000-07-13  Bill Nottingham  <notting@redhat.com>
 
 	* rc.d/rc.sysinit: fix == in shell
diff --git a/initscripts.spec b/initscripts.spec
index c882f95d..6dda7972 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
-Summary: The inittab file and the /etc/rc.d/init.d scripts.
+Summary: The inittab file and the /etc/init.d scripts.
 Name: initscripts
-Version: 5.36
+Version: 5.35
 Copyright: GPL
 Group: System Environment/Base
 Release: 1
@@ -229,9 +229,6 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
-* Mon Jul 24 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- Some files were still trying to source /etc/init.d/*
-
 * Tue Jul 18 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - add "nousb" command line parameter
 - fix some warnings when mounting /proc/bus/usb
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 0a2457aa..3922af3a 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
 # functions	This file contains functions to be used by most or all
-#		shell scripts in the /etc/rc.d/init.d directory.
+#		shell scripts in the /etc/init.d directory.
 #
-# Version:	@(#) /etc/rc.d/init.d/functions 1.01 26-Oct-1993
+# Version:	@(#) /etc/init.d/functions 1.01 26-Oct-1993
 #
 # Author:	Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 # Hacked by:    Greg Galloway and Marc Ewing
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 738a6532..22f008c9 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -11,7 +11,7 @@
 # Set the path.
 PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 runcmd() {
    echo -n "$1 "
diff --git a/rc.d/init.d/killall b/rc.d/init.d/killall
index 9d244119..0aff07ac 100755
--- a/rc.d/init.d/killall
+++ b/rc.d/init.d/killall
@@ -11,10 +11,10 @@ for i in /var/lock/subsys/*; do
 	subsys=${i#/var/lock/subsys/}
 
 	# Bring the subsystem down.
-	if [ -f /etc/rc.d/init.d/$subsys.init ]; then
-	    /etc/rc.d/init.d/$subsys.init stop
+	if [ -f /etc/init.d/$subsys.init ]; then
+	    /etc/init.d/$subsys.init stop
 	else
-	    /etc/rc.d/init.d/$subsys stop
+	    /etc/init.d/$subsys stop
 	fi
 done
 
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index 57cb462e..39e6ef76 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -15,7 +15,7 @@ if [ ! -f /etc/sysconfig/network ]; then
 fi
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 . /etc/sysconfig/network
 
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 30025a04..6c79c36b 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -8,7 +8,7 @@
 # probe: true
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 if [ ! -f /etc/sysconfig/network ]; then
     exit 0
@@ -88,7 +88,7 @@ case "$1" in
 		SMBMTAB=`grep -v '^#' /proc/mounts | awk '{ if ($3 ~ /^smbfs$/ ) print $2}'`
 		NCPMTAB=`grep -v '^#' /proc/mounts | awk '{ if ($3 ~ /^ncpfs$/ ) print $2}'`
 		if [ -n "$NFSMTAB" -o -n "$SMBMTAB" -o -n "$NCPMTAB" ] ; then
-			/etc/rc.d/init.d/netfs stop
+			/etc/init.d/netfs stop
 		fi
 	fi
 	
diff --git a/rc.d/init.d/random b/rc.d/init.d/random
index 87a91a8c..42dce627 100755
--- a/rc.d/init.d/random
+++ b/rc.d/init.d/random
@@ -9,7 +9,7 @@
 #              random number generation.
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 random_seed=/var/run/random-seed
 
diff --git a/rc.d/init.d/single b/rc.d/init.d/single
index 7b453a09..6806d0c3 100755
--- a/rc.d/init.d/single
+++ b/rc.d/init.d/single
@@ -10,7 +10,7 @@
 #               Modified for RHS Linux by Damien Neil
 #
 
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 # Set the path.
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/rc.d/rc b/rc.d/rc
index 3dd5eff6..58fef4bf 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -10,7 +10,7 @@
 #
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 # Now find out what the current and what the previous runlevel are.
 argv1="$1"
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index e57781f1..d249db77 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -26,7 +26,7 @@ else
 fi
 
 # Source functions
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 # Print a banner. ;)
 echo -en "\t\t\tWelcome to "
diff --git a/service b/service
index 0a6d297b..67fb3592 100755
--- a/service
+++ b/service
@@ -4,7 +4,7 @@ VERSION="`basename $0` ver. 0.91"
 USAGE="Usage: `basename $0` < option > | --status-all | \
 [ service_name [ command | --full-restart ] ]"
 SERVICE=
-SERVICEDIR="/etc/rc.d/init.d"
+SERVICEDIR="/etc/init.d"
 
 if [ $# -eq 0 ]; then
    echo "${USAGE}" >&2
diff --git a/src/Makefile b/src/Makefile
index 654483e0..32d87b9b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,7 +39,7 @@ install:
 # not installed by default, only comes from sources.
 install-test:
 	install -s -m 755 testd $(ROOT)/usr/sbin/testd
-	install -m 755 testdinit $(ROOT)/etc/rc.d/init.d/testd
+	install -m 755 testdinit $(ROOT)/etc/init.d/testd
 
 ipcalc: ipcalc.o
 	$(CC) $(LDFLAGS) -o $@ $< /usr/lib/libpopt.a
diff --git a/src/testdinit b/src/testdinit
index f2f4a85b..67ea8c37 100755
--- a/src/testdinit
+++ b/src/testdinit
@@ -5,7 +5,7 @@
 #
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 # See how we were called.
 case "$1" in
diff --git a/sysvinitfiles b/sysvinitfiles
index 9e9ddeb7..3a39ed43 100644
--- a/sysvinitfiles
+++ b/sysvinitfiles
@@ -1,7 +1,7 @@
 Writing System V init scripts for Red Hat Linux
 ===============================================
 
-All System V init scripts are named /etc/rc.d/init.d/<servicename>
+All System V init scripts are named /etc/init.d/<servicename>
 where <servicename> is the name of the service.  There must be no
 ".init" suffix.
 
@@ -11,7 +11,7 @@ Sample Script
 
 #!/bin/bash
 #
-#	/etc/rc.d/init.d/<servicename>
+#	/etc/init.d/<servicename>
 #
 #	<description of the *service*>
 #	<any general comments about this init script>
@@ -23,7 +23,7 @@ Sample Script
 #  mistaken for tags, should they happen to fit the pattern.>
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 <define any local shell functions used by the code that follows>
 
@@ -72,7 +72,7 @@ which you intend to be used interactively to the usage message.
 
 
 
-Functions in /etc/rc.d/init.d/functions
+Functions in /etc/init.d/functions
 =======================================
 
 daemon [+/-nicelevel] program [arguments] [&]
@@ -165,7 +165,7 @@ Tags
 	acheived by running these commands:
 
 	command=$(/etc/rd.d/init.d/SCRIPT probe)
-	[ -n "$command" ] && /etc/rc.d/init.d/SCRIPT $command
+	[ -n "$command" ] && /etc/init.d/SCRIPT $command
 
 	where SCRIPT is the name of the service's sysv init script.