From 32b375baeff00c7f8205b6c95b8a6525373bdd97 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 24 Jul 2000 19:41:41 +0000
Subject: revert

---
 rc.d/init.d/functions | 4 ++--
 rc.d/init.d/halt      | 2 +-
 rc.d/init.d/killall   | 6 +++---
 rc.d/init.d/netfs     | 2 +-
 rc.d/init.d/network   | 4 ++--
 rc.d/init.d/random    | 2 +-
 rc.d/init.d/single    | 2 +-
 rc.d/rc               | 2 +-
 rc.d/rc.sysinit       | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'rc.d')

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 "
-- 
cgit v1.2.1