Permit /usr to be NFS mounted.r3-68

3 files changed, 21 insertions, 19 deletions

diff --git a/initscripts.spec b/initscripts.spec
index 2285cd07..743b4f9f 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
 Summary: inittab and /etc/rc.d scripts
 Name: initscripts
-%define version 3.67
+%define version 3.68
 Version: %{version}
 Copyright: GPL
 Group: Base
@@ -45,21 +45,21 @@ ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc4.d/S20random
 ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc5.d/S20random
 ln -s ../init.d/random $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K80random
 
-ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K95nfsfs
-ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc1.d/K95nfsfs
-ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc2.d/K95nfsfs
+ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K85nfsfs
+ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc1.d/K85nfsfs
+ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc2.d/K85nfsfs
 ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc3.d/S15nfsfs
 ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc4.d/S15nfsfs
 ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc5.d/S15nfsfs
-ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K95nfsfs
+ln -s ../init.d/nfsfs $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K85nfsfs
 
-ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K97network
-ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc1.d/K97network
+ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K90network
+ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc1.d/K90network
 ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc2.d/S10network
 ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc3.d/S10network
 ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc4.d/S10network
 ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc5.d/S10network
-ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K97network
+ln -s ../init.d/network $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K90network
 
 ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc0.d/K90killall
 ln -s ../init.d/killall $RPM_BUILD_ROOT/etc/rc.d/rc6.d/K90killall
@@ -153,9 +153,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc sysconfig.txt
 
 %changelog
+* Tue Jul  7 1998 Jeff Johnson <jbj@redhat.com>
+- start/stop run levels changed.
+- ipx_configure/ipx_internal_net moved to /sbin.
 
 * Wed Jul 01 1998 Erik Troan <ewt@redhat.com>
-
 - usernetctl didn't understand "" around USERCTL attribute
 
 * Wed Jul  1 1998 Jeff Johnson <jbj@redhat.com>
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 3bb2afd5..425d6c38 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -2,7 +2,7 @@
 #
 # network       Bring up/down networking
 #
-# chkconfig: 2345 10 97
+# chkconfig: 2345 10 90
 # description: Activates/Deactivates all network interfaces configured to \
 #              start at boot time.
 # probe: true
@@ -27,7 +27,7 @@ fi
 [ -x /sbin/ifconfig ] || exit 0
 
 # Even if IPX is configured, without the utilities we can't do much
-[ ! -x /usr/bin/ipx_internal_net -o ! -x /usr/bin/ipx_configure ] && IPX=
+[ ! -x /sbin/ipx_internal_net -o ! -x /sbin/ipx_configure ] && IPX=
 
 cd /etc/sysconfig/network-scripts
 
@@ -74,9 +74,9 @@ case "$1" in
 
 	case "$IPX" in
 	  yes|true)
-	    /usr/bin/ipx_configure --auto_primary=$IPXAUTOPRIMARY \
+	    /sbin/ipx_configure --auto_primary=$IPXAUTOPRIMARY \
 				   --auto_interface=$IPXAUTOFRAME
-	    /usr/bin/ipx_internal_net add $IPXINTERNALNETNUM $IPXINTERNALNODENUM
+	    /sbin/ipx_internal_net add $IPXINTERNALNETNUM $IPXINTERNALNODENUM
 	    ;;
 	esac
 
@@ -92,7 +92,7 @@ case "$1" in
 	done
 	case "$IPX" in
 	  yes|true)
-	    /usr/bin/ipx_internal_net del
+	    /sbin/ipx_internal_net del
 	    ;;
 	esac
 	./ifdown ifcfg-lo
@@ -144,16 +144,16 @@ case "$1" in
 		case $IPX in yes|true)
 		  case $IPXINTERNALNET in
 		    reconf)
-			/usr/bin/ipx_internal_net del
-			/usr/bin/ipx_internal_net add $IPXINTERNALNETNUM \
+			/sbin/ipx_internal_net del
+			/sbin/ipx_internal_net add $IPXINTERNALNETNUM \
 						      $IPXINTERNALNODENUM
 			;;
 		    add)
-			/usr/bin/ipx_internal_net add $IPXINTERNALNETNUM \
+			/sbin/ipx_internal_net add $IPXINTERNALNETNUM \
 						      $IPXINTERNALNODENUM
 			;;
 		    del)
-			/usr/bin/ipx_internal_net del
+			/sbin/ipx_internal_net del
 			;;
 		  esac
 		  ;;
diff --git a/rc.d/init.d/nfsfs b/rc.d/init.d/nfsfs
index 76eccddc..108b8036 100755
--- a/rc.d/init.d/nfsfs
+++ b/rc.d/init.d/nfsfs
@@ -6,7 +6,7 @@
 #
 # Author:       Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
 #
-# chkconfig: 345 15 95
+# chkconfig: 345 15 85
 # description: Mounts and unmounts all Network File System (NFS) \
 #              mount points.