/etc/rc.d/init.d -> /etc/init.d. Wheeeeee.

8 files changed, 25 insertions, 25 deletions

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 e3ae2f74..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
@@ -39,7 +39,7 @@ if [ -f /proc/sys/kernel/modprobe ]; then
 fi
 
 # If they want to run something in single user mode, might as well run it...
-for i in /etc/rc.d/rc1.d/S[0-9][0-9]*; do
+for i in /etc/rc1.d/S[0-9][0-9]*; do
         # Check if the script is there.
         [ ! -f $i ] && continue
 		
@@ -47,7 +47,7 @@ for i in /etc/rc.d/rc1.d/S[0-9][0-9]*; do
 	[ "${i%.rpmsave}" != "${i}" ] && continue
 	[ "${i%.rpmorig}" != "${i}" ] && continue
 	[ "${i%.rpmnew}" != "${i}" ] && continue
-	[ "$i" = "/etc/rc.d/rc1.d/S00single" ] && continue
+	[ "$i" = "/etc/rc1.d/S00single" ] && continue
 	$i start
 done						
 
diff --git a/rc.d/rc b/rc.d/rc
index 13892672..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"
@@ -35,12 +35,12 @@ fi
 [ "$1" != "" ] && runlevel="$argv1"
 
 # Tell linuxconf what runlevel we are in
-[ -d /var/run ] && echo "/etc/rc.d/rc$runlevel.d" > /var/run/runlevel.dir
+[ -d /var/run ] && echo "/etc/rc$runlevel.d" > /var/run/runlevel.dir
 
 # Is there an rc directory for this new runlevel?
-if [ -d /etc/rc.d/rc$runlevel.d ]; then
+if [ -d /etc/rc$runlevel.d ]; then
 	# First, run the KILL scripts.
-	for i in /etc/rc.d/rc$runlevel.d/K*; do
+	for i in /etc/rc$runlevel.d/K*; do
 		# Check if the script is there.
 		[ ! -f $i ] && continue
 
@@ -50,7 +50,7 @@ if [ -d /etc/rc.d/rc$runlevel.d ]; then
 		[ "${i%.rpmnew}" != "${i}" ] && continue
 
 		# Check if the subsystem is already up.
-		subsys=${i#/etc/rc.d/rc$runlevel.d/K??}
+		subsys=${i#/etc/rc$runlevel.d/K??}
 		[ ! -f /var/lock/subsys/$subsys ] && \
 		    [ ! -f /var/lock/subsys/${subsys}.init ] && continue
 
@@ -63,7 +63,7 @@ if [ -d /etc/rc.d/rc$runlevel.d ]; then
 	done
 
 	# Now run the START scripts.
-	for i in /etc/rc.d/rc$runlevel.d/S*; do
+	for i in /etc/rc$runlevel.d/S*; do
 		# Check if the script is there.
 		[ ! -f $i ] && continue
 
@@ -73,7 +73,7 @@ if [ -d /etc/rc.d/rc$runlevel.d ]; then
 		[ "${i%.rpmnew}" != "${i}" ] && continue
 
 		# Check if the subsystem is already up.
-		subsys=${i#/etc/rc.d/rc$runlevel.d/S??}
+		subsys=${i#/etc/rc$runlevel.d/S??}
 		[ -f /var/lock/subsys/$subsys ] || \
 		    [ -f /var/lock/subsys/${subsys}.init ] && continue
 		    
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 01fe52b3..8c72cfc2 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# /etc/rc.d/rc.sysinit - run once at boot time
+# /etc/rc.sysinit - run once at boot time
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 #
 
 # Rerun ourselves through initlog
 if [ -z "$IN_INITLOG" ]; then
- [ -f /sbin/initlog ] && exec /sbin/initlog $INITLOG_ARGS -r /etc/rc.d/rc.sysinit
+ [ -f /sbin/initlog ] && exec /sbin/initlog $INITLOG_ARGS -r /etc/rc.sysinit
 fi
 
 # If we're using devfs, start devfsd now - we need the old device names
@@ -30,7 +30,7 @@ else
 fi
 
 # Source functions
-. /etc/rc.d/init.d/functions
+. /etc/init.d/functions
 
 # Print a banner. ;)
 echo -en "\t\t\tWelcome to "
@@ -304,8 +304,8 @@ if [ -f /proc/sys/kernel/modprobe ]; then
 fi
 
 # Load modules (for backward compatibility with VARs)
-if [ -f /etc/rc.d/rc.modules ]; then
-	/etc/rc.d/rc.modules
+if [ -f /etc/rc.modules ]; then
+	/etc/rc.modules
 fi
 
 # Add raid devices
@@ -492,8 +492,8 @@ swapon -a >/dev/null 2>&1
 action "Enabling swap space" /bin/true
 
 # Initialize the serial ports.
-if [ -f /etc/rc.d/rc.serial ]; then
-	. /etc/rc.d/rc.serial
+if [ -f /etc/rc.serial ]; then
+	. /etc/rc.serial
 fi
 
 # If a SCSI tape has been detected, load the st module unconditionally