r2793 - in trunk/bootscripts: . blfs/init.d blfs/sysconfig blfs/sysconfig/network-devices/services

dj at linuxfromscratch.org dj at linuxfromscratch.org
Mon Oct 11 21:20:36 PDT 2004


Author: dj
Date: 2004-10-11 22:20:35 -0600 (Mon, 11 Oct 2004)
New Revision: 2793

Added:
   trunk/bootscripts/blfs/sysconfig/nfs
Modified:
   trunk/bootscripts/ChangeLog
   trunk/bootscripts/MAINTAINERS
   trunk/bootscripts/Makefile
   trunk/bootscripts/README
   trunk/bootscripts/blfs/init.d/nfs-client
   trunk/bootscripts/blfs/init.d/nfs-server
   trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient
   trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
   trunk/bootscripts/blfs/sysconfig/network-devices/services/ipx
   trunk/bootscripts/blfs/sysconfig/network-devices/services/pppoe
Log:
nfs scripts fixes and added remaining svn keywords

Modified: trunk/bootscripts/ChangeLog
===================================================================
--- trunk/bootscripts/ChangeLog	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/ChangeLog	2004-10-12 04:20:35 UTC (rev 2793)
@@ -1,3 +1,17 @@
+2004-10-11 DJ Lucas <dj at linuxfromscratch.org>
+	* Fixed multiple errors in nfs-server bootscript
+	* Added sysconfig file for nfs-server bootscript
+	* Removed lockd from nfs-client bootscript
+	* Added svn keywords to remaining bootscripts
+
+2004-10-02 DJ Lucas <dj at linuxfromscratch.org>
+	* Changed all scripts to use full path names
+
+2004-09-28 DJ Lucas <dj at linuxfromscratch.org>
+	* Replaced nfs-server and nfs-client scripts
+	* Adjusted mysql and winbind scripts to use PIDFILE
+	* Added svn keywords to remaining bootscripts
+
 2004-08-26 Randy McMurchy <randy at linuxfromscratch.org>
 	* Removed usb script (suggested by Alexander Patrakov)
 

Modified: trunk/bootscripts/MAINTAINERS
===================================================================
--- trunk/bootscripts/MAINTAINERS	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/MAINTAINERS	2004-10-12 04:20:35 UTC (rev 2793)
@@ -3,3 +3,4 @@
 
 Special thanks to Nathan Coulson and Zack Winkles for
 synchronizing the BLFS Bootscripts with LFS Bootscripts.
+

Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/Makefile	2004-10-12 04:20:35 UTC (rev 2793)
@@ -2,6 +2,7 @@
 EXTDIR=${DESTDIR}${ETCDIR}
 MODE=754
 DIRMODE=755
+CONFMODE=644
 
 # The grep can probably be improved upon.
 all:
@@ -220,6 +221,7 @@
 
 install-nfs-server: create-dirs
 	install -m ${MODE} blfs/init.d/nfs-server ${EXTDIR}/rc.d/init.d/
+	install -m ${CONFMODE} blfs/sysconfig/nfs ${EXTDIR}/sysconfig/
 	ln -sf  ../init.d/nfs-server ${EXTDIR}/rc.d/rc0.d/K48nfs-server
 	ln -sf  ../init.d/nfs-server ${EXTDIR}/rc.d/rc1.d/K48nfs-server
 	ln -sf  ../init.d/nfs-server ${EXTDIR}/rc.d/rc2.d/K48nfs-server

Modified: trunk/bootscripts/README
===================================================================
--- trunk/bootscripts/README	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/README	2004-10-12 04:20:35 UTC (rev 2793)
@@ -7,9 +7,8 @@
 for compatibility information.
 
 The various install targets are mentioned in the BLFS book. There 
-are variables defined for script permissions {MODE}, directory 
-permissions {DIRMODE} and destination directory {DESTDIR}.  For 
-more information refer to the BLFS BOOK at
-	http://www.linuxfromscratch.org/blfs/
+are variables defined for script permissions {MODE}, configuration 
+file permissions {CONFMODE}, directory permissions {DIRMODE} and 
+destination directory {DESTDIR}.  For more information refer to the 
+BLFS BOOK at http://www.linuxfromscratch.org/blfs/ .
 
-

Modified: trunk/bootscripts/blfs/init.d/nfs-client
===================================================================
--- trunk/bootscripts/blfs/init.d/nfs-client	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/init.d/nfs-client	2004-10-12 04:20:35 UTC (rev 2793)
@@ -14,15 +14,9 @@
 	start)
 		echo "Starting NFS statd..."
 		loadproc /usr/sbin/rpc.statd
-
-		echo "Starting NFS lockd..."
-		loadproc /usr/sbin/rpc.lockd
 		;;
 
 	stop)
-		echo "Stopping NFS lockd..."
-		killproc /usr/sbin/rpc.lockd
-
 		echo "Stopping NFS statd..."
 		killproc /usr/sbin/rpc.statd
 		;;
@@ -35,7 +29,6 @@
 
 	status)
 		statusproc /usr/sbin/rpc.statd
-		statusproc /usr/sbin/rpc.lockd
 		;;
 
 	*)

Modified: trunk/bootscripts/blfs/init.d/nfs-server
===================================================================
--- trunk/bootscripts/blfs/init.d/nfs-server	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/init.d/nfs-server	2004-10-12 04:20:35 UTC (rev 2793)
@@ -28,16 +28,16 @@
 		fi
 		
 		# NFSD support only in 2.6 kernel
-		/bin/uname -r | /bin/grep "2.6"
+		/bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
 		if [ $? == 0 ]; then
 			echo "Mounting nfsd virtual filesystem..."
 			/bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
-			evalutate_retval
+			evaluate_retval
 		fi
 
 		# Make ceratin that the list is refreshed on 
 		# a restart.
-		echo "Starting NFS Server..."
+		echo "Exporting NFS Filesystems..."
 		/usr/sbin/exportfs -ra 2>&1 > /dev/null
 		evaluate_retval
 		;;
@@ -63,9 +63,17 @@
 			killproc /usr/sbin/rpc.rquotad
 		fi
 
-		echo "Stopping NFS Server Services..."
+		echo "Refreshing NFS Exported Filesystems..."
 		/usr/sbin/exportfs -au 2>&1 > /dev/null
 		evaluate_retval
+
+		# NFSD support only in 2.6 kernel
+                /bin/uname -r | /bin/grep "2.6" 2>&1 > /dev/null
+                if [ $? == 0 ]; then
+			echo "Unmounting NFS Virtual Filesystem..."
+			/bin/umount /proc/fs/nfsd 2>&1 > /dev/null
+			evaluate_retval
+		fi
 		;;
 
 	reload)

Modified: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient
===================================================================
--- trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient	2004-10-12 04:20:35 UTC (rev 2793)
@@ -1,10 +1,13 @@
 #!/bin/sh
 # Begin $network-devices/services/dhclient
-                                                                                
+
 # Based upon lfs-bootscripts-1.12 $network_devices/if{down,up}
 # Rewritten by Nathan Coulson <nathan at linuxfromscratch.org>
 # Adapted for dhclient by DJ Lucas <dj at lucasit.com>
 
+#$LastChangedBy$
+#$Date$
+
 . /etc/sysconfig/rc
 . $rc_functions
 . $IFCONFIG


Property changes on: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhclient
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Modified: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
===================================================================
--- trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd	2004-10-12 04:20:35 UTC (rev 2793)
@@ -1,10 +1,13 @@
 #!/bin/sh
 # Begin $network-devices/services/dhcpcd
-                                                                                
+
 # Based upon lfs-bootscripts-1.12 $network_devices/if{down,up}
 # Rewritten by Nathan Coulson <nathan at linuxfromscratch.org>
 # Adapted for dhcpcd by DJ Lucas <dj at lucasit.com>
 
+#$LastChangedBy$
+#$Date$
+
 . /etc/sysconfig/rc
 . $rc_functions
 . $IFCONFIG


Property changes on: trunk/bootscripts/blfs/sysconfig/network-devices/services/dhcpcd
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Modified: trunk/bootscripts/blfs/sysconfig/network-devices/services/ipx
===================================================================
--- trunk/bootscripts/blfs/sysconfig/network-devices/services/ipx	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/sysconfig/network-devices/services/ipx	2004-10-12 04:20:35 UTC (rev 2793)
@@ -5,6 +5,9 @@
 # Rewritten by Nathan Coulson <nathan at linuxfromscratch.org>
 # Adapted for ipx by DJ Lucas <dj at lucasit.com>
 
+#$LastChangedBy$
+#$Date$
+
 . /etc/sysconfig/rc || exit
 . $rc_functions || exit
 . $IFCONFIG


Property changes on: trunk/bootscripts/blfs/sysconfig/network-devices/services/ipx
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Modified: trunk/bootscripts/blfs/sysconfig/network-devices/services/pppoe
===================================================================
--- trunk/bootscripts/blfs/sysconfig/network-devices/services/pppoe	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/sysconfig/network-devices/services/pppoe	2004-10-12 04:20:35 UTC (rev 2793)
@@ -5,6 +5,9 @@
 # Rewritten by Nathan Coulson <nathan at linuxfromscratch.org>
 # Adapted for pppoe by DJ Lucas <dj at lucasit.com>
 
+#$LastChangedBy$
+#$Date$
+
 . /etc/sysconfig/rc
 . $rc_functions
 


Property changes on: trunk/bootscripts/blfs/sysconfig/network-devices/services/pppoe
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date

Added: trunk/bootscripts/blfs/sysconfig/nfs
===================================================================
--- trunk/bootscripts/blfs/sysconfig/nfs	2004-10-12 03:56:04 UTC (rev 2792)
+++ trunk/bootscripts/blfs/sysconfig/nfs	2004-10-12 04:20:35 UTC (rev 2793)
@@ -0,0 +1,6 @@
+#$LastChangedBy$
+#$Date$
+
+PORT="2049"
+PROCESSES="8"
+QUOTAS="no"


Property changes on: trunk/bootscripts/blfs/sysconfig/nfs
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list