Author: dj
Date: 2011-12-05 00:38:40 -0700 (Mon, 05 Dec 2011)
New Revision: 9063

Modified:
   trunk/bootscripts/blfs/init.d/cups
   trunk/bootscripts/blfs/init.d/gpm
   trunk/bootscripts/blfs/init.d/lprng
   trunk/bootscripts/blfs/init.d/mysql
   trunk/bootscripts/blfs/init.d/netfs
   trunk/bootscripts/blfs/init.d/nfs-client
   trunk/bootscripts/blfs/init.d/nfs-server
   trunk/bootscripts/blfs/init.d/ntpd
   trunk/bootscripts/blfs/init.d/portmap
   trunk/bootscripts/blfs/init.d/postfix
   trunk/bootscripts/blfs/init.d/random
   trunk/bootscripts/blfs/init.d/rpcbind
   trunk/bootscripts/blfs/init.d/svn
Log:
Updated gpm script, various dependency fixes and text cleanups.

Modified: trunk/bootscripts/blfs/init.d/cups
===================================================================
--- trunk/bootscripts/blfs/init.d/cups  2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/cups  2011-12-05 07:38:40 UTC (rev 9063)
@@ -11,16 +11,16 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            sshad
-# Required-Start:      network
-# Should-Start:
-# Required-Stop:       sendsignals
-# Should-Stop:
+# Provides:            cups
+# Required-Start:      $network
+# Should-Start:        $remote_fs haldaemon
+# Required-Stop:       $network
+# Should-Stop:         haldaemon $remote_fs
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts cups print daemon.
 # Description:         Starts cups print daemon.
-# X-LFS-Provided-By:   LFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions

Modified: trunk/bootscripts/blfs/init.d/gpm
===================================================================
--- trunk/bootscripts/blfs/init.d/gpm   2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/gpm   2011-12-05 07:38:40 UTC (rev 9063)
@@ -1,53 +1,83 @@
 #!/bin/sh
-# Begin $rc_base/init.d/gpm
+#######################################################################
+# Begin /etc/init.d/gpm
+#
+# Description : Start GPM Console Mouse Service
+#
+# Author      : DJ Lucas - [email protected]
+#
+# Version     : LFS 7.0
+#
+########################################################################
 
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - [email protected]
-# GPM specific parts by Mark Hymers - [email protected]
+### BEGIN INIT INFO
+# Provides:            gpm
+# Required-Start:      $network $local_fs
+# Should-Start:
+# Required-Stop:       $local_fs $network
+# Should-Stop:
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Starts and stops the GPM console mouse service.
+# Description:         Starts and stops the GPM console mouse service.
+# X-LFS-Provided-By:   BLFS / LFS 7.0
+### END INIT INFO
 
+. /lib/lsb/init-functions
+
 #$LastChangedBy$
 #$Date$
 
-. /etc/sysconfig/rc
-. $rc_functions
+pidfile="/run/gpm.pid"
 
-if [ -f /etc/sysconfig/mouse ]
-       then
-       . /etc/sysconfig/mouse
-fi
+[ -f /etc/sysconfig/mouse ] && source /etc/sysconfig/mouse
 
-if [ -z "$MDEVICE" ] || [ -z "$PROTOCOL" ]
-       then
-       echo "Please create an /etc/sysconfig/mouse file containing"
-       echo "MDEVICE and PROTOCOL values"
-       exit 1;
-fi
+case "${1}" in
+   start)
+      log_info_msg "Starting GPM console mouse service..."
+      if [ "${MDEVICE}" = "" -o "${PROTOCOL}" = "" ]; then
+         log_info_msg2 "invalid configuration"
+         log_failure_msg
+         exit 2
+      fi
+      start_daemon /usr/sbin/gpm -m "${MDEVICE}" -t "${PROTOCOL}" "${GPMOPTS}"
+      evaluate_retval
+      ;;
 
-case "$1" in
-       start)
-               boot_mesg "Starting gpm..."
-               loadproc /usr/sbin/gpm -m $MDEVICE -t $PROTOCOL $GPMOPTS
-               ;;
+   stop)
+      log_info_msg "Stopping GPM console mouse service..."
+      killproc /usr/sbin/gpm
+      evaluate_retval
+      ;;
 
-       stop)
-               boot_mesg "Stopping gpm..."
-               killproc /usr/sbin/gpm
-               ;;
+   force-reload)
+      # gpm does not honor SIGHUP, restart if running
+      kill -0 `pidofproc -p "${pidfile}" /usr/sbin/gpm` 2>/dev/null
+      if [ "${?}" = "0" ]; then
+         ${0} restart
+      else
+         log_info_msg "Force reloading GPM console mouse service..."
+         log_info_msg2 "not running"
+         log_failure_msg
+      fi
+      ;;
 
-       restart)
-               $0 stop
-               sleep 1
-               $0 start
-               ;;
+   restart)
+      ${0} stop
+      sleep 1
+      ${0} start
+      ;;
 
-       status)
-               statusproc /usr/sbin/gpm
-               ;;
+   status)
+      statusproc /usr/sbin/gpm
+      ;;
 
-       *)
-               echo "Usage: $0 {start|stop|restart|status}"
-               exit 1
-               ;;
+   *)
+      echo "Usage: ${0} {start|stop|force-reload|restart|status}"
+      exit 1
+      ;;
 esac
 
-# End $rc_base/init.d/gpm
+exit 0
+
+# End /etc/init.d/gpm

Modified: trunk/bootscripts/blfs/init.d/lprng
===================================================================
--- trunk/bootscripts/blfs/init.d/lprng 2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/lprng 2011-12-05 07:38:40 UTC (rev 9063)
@@ -11,15 +11,16 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            lpd
-# Required-Start:      network
-# Should-Start:
-# Required-Stop:       sendsignals
-# Should-Stop:
+# Provides:            lprng
+# Required-Start:      $network
+# Should-Start:        $remote_fs
+# Required-Stop:       $network
+# Should-Stop:         $remote_fs
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts lpd daemon.
-# Description:         Starts an implementation of the Berkeley LPR print 
spooler functionality.
+# Description:         Starts an implementation of the Berkeley LPR print
+#                      spooler functionality.
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 

Modified: trunk/bootscripts/blfs/init.d/mysql
===================================================================
--- trunk/bootscripts/blfs/init.d/mysql 2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/mysql 2011-12-05 07:38:40 UTC (rev 9063)
@@ -11,16 +11,16 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            $svnserve
-# Required-Start:
-# Should-Start:
-# Required-Stop:       $sendsignals
-# Should-Stop:
+# Provides:            mysql
+# Required-Start:      $network
+# Should-Start:        $remote_fs
+# Required-Stop:       $network
+# Should-Stop:         $remote_fs
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts MySQL server.
 # Description:         Starts MySQL server.
-# X-LFS-Provided-By:   LFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions

Modified: trunk/bootscripts/blfs/init.d/netfs
===================================================================
--- trunk/bootscripts/blfs/init.d/netfs 2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/netfs 2011-12-05 07:38:40 UTC (rev 9063)
@@ -12,17 +12,17 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:    nfs mounts
-# Required-Start: nfs-client nfs-server
-# Should-Start:
-# Required-Stop:  sendsignals
-# Should-Stop:
-# Default-Start:  3 4 5
-# Default-Stop:   0 1 2 6
+# Provides:          $remote_fs
+# Required-Start:    $network
+# Should-Start:      nfs-client nfs-server
+# Required-Stop:     $network
+# Should-Stop:       nfs-server nfs-client
+# Default-Start:     3 4 5
+# Default-Stop:      0 1 2 6
 # Short-Description: Mounts network volumes.
-# Description:    Mounts anything marked as _netdev, and umounts
-#        any mounted _netfs, smbfs, ncpfd,coda, or nfs volumes
-# X-LFS-Provided-By: LFS
+# Description:       Mounts anything marked as _netdev, and umounts and mounted
+#                    _netfs, smbfs, ncpfd, coda, or nfs volumes
+# X-LFS-Provided-By: BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions

Modified: trunk/bootscripts/blfs/init.d/nfs-client
===================================================================
--- trunk/bootscripts/blfs/init.d/nfs-client    2011-12-05 05:42:37 UTC (rev 
9062)
+++ trunk/bootscripts/blfs/init.d/nfs-client    2011-12-05 07:38:40 UTC (rev 
9063)
@@ -12,16 +12,16 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:    File locking for nfs client
-# Required-Start: rpcbind
+# Provides:          nfs-client
+# Required-Start:    rpcbind
 # Should-Start:
-# Required-Stop:  sendsignals
+# Required-Stop:     rpcbind
 # Should-Stop:
-# Default-Start:  3 4 5
+# Default-Start:     3 4 5
 # Default-Stop:      0 1 2 6
 # Short-Description: Starts statd
-# Description:    rpc.statd provides file locking on nfs.
-# X-LFS-Provided-By: LFS
+# Description:       rpc.statd provides file locking on nfs.
+# X-LFS-Provided-By: BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions

Modified: trunk/bootscripts/blfs/init.d/nfs-server
===================================================================
--- trunk/bootscripts/blfs/init.d/nfs-server    2011-12-05 05:42:37 UTC (rev 
9062)
+++ trunk/bootscripts/blfs/init.d/nfs-server    2011-12-05 07:38:40 UTC (rev 
9063)
@@ -12,20 +12,19 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            nfs server
+# Provides:            nfs-server
 # Required-Start:      rpcbind
 # Should-Start:
-# Required-Stop:       sendsignals
+# Required-Stop:       rpcbind
 # Should-Stop:
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts the nfs server
 # Description:         Starts the nfs server and exports directories.
-# X-LFS-Provided-By:   LFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions
-# Begin $rc_base/init.d/nfs-server
 
  #$LastChangedBy$
  #$Date$

Modified: trunk/bootscripts/blfs/init.d/ntpd
===================================================================
--- trunk/bootscripts/blfs/init.d/ntpd  2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/ntpd  2011-12-05 07:38:40 UTC (rev 9063)
@@ -14,7 +14,7 @@
 ### BEGIN INIT INFO
 # Provides:            ntpd
 # Required-Start:      $time $network
-# Should-Start:
+# Should-Start:        $remote_fs
 # Required-Stop:       $network
 # Should-Stop:         $remote_fs
 # Default-Start:       3 4 5

Modified: trunk/bootscripts/blfs/init.d/portmap
===================================================================
--- trunk/bootscripts/blfs/init.d/portmap       2011-12-05 05:42:37 UTC (rev 
9062)
+++ trunk/bootscripts/blfs/init.d/portmap       2011-12-05 07:38:40 UTC (rev 
9063)
@@ -11,10 +11,10 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            portmap
-# Required-Start:      network
+# Provides:            $portmap
+# Required-Start:      $network
 # Should-Start:
-# Required-Stop:       sendsignals
+# Required-Stop:       $network
 # Should-Stop:
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6

Modified: trunk/bootscripts/blfs/init.d/postfix
===================================================================
--- trunk/bootscripts/blfs/init.d/postfix       2011-12-05 05:42:37 UTC (rev 
9062)
+++ trunk/bootscripts/blfs/init.d/postfix       2011-12-05 07:38:40 UTC (rev 
9063)
@@ -1,5 +1,15 @@
 #!/bin/sh
-# Begin /etc/init.d/postfix
+########################################################################
+# Begin postfix
+#
+# Description : Starts Postfix Mail Trasfer Agent
+#
+# Author      : DJ Lucas - [email protected]
+#               Bruce Dubbs - [email protected]
+#
+# Version     : LFS 7.0
+#
+########################################################################
 
 ### BEGIN INIT INFO
 # Provides:            postfix
@@ -7,11 +17,11 @@
 # Should-Start:        $remote_fs
 # Required-Stop:       $network
 # Should-Stop:         $remote_fs
-# Default-Start:       2 3 4 5
-# Default-Stop:        0 1 6
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
 # Short-Description:   Postfix MTA
 # Description:         Controls the Postfix Mail Transfer Agent
-# X-LFS-Provided-By:   BLFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions

Modified: trunk/bootscripts/blfs/init.d/random
===================================================================
--- trunk/bootscripts/blfs/init.d/random        2011-12-05 05:42:37 UTC (rev 
9062)
+++ trunk/bootscripts/blfs/init.d/random        2011-12-05 07:38:40 UTC (rev 
9063)
@@ -11,26 +11,21 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            Initialises /dev/urandom
-# Required-Start:      network  
+# Provides:            random
+# Required-Start:      $syslog
 # Should-Start:
-# Required-Stop:       sendsignals  
+# Required-Stop:       $syslog
 # Should-Stop:
-# Default-Start:       3 4 5
-# Default-Stop:                0 1 2 6
+# Default-Start:       2 3 4 5
+# Default-Stop:                0 1 6
 # Short-Description:   Initialises /dev/urandom
 # Description:         Initialises /dev/urandom from a seed stored in
 #                      /var/tmp.
-# X-LFS-Provided-By:   LFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - [email protected]
-# Random script elements by Larry Lawrence
 . /lib/lsb/init-functions
 
-# Begin $rc_base/init.d/random
-
 #$LastChangedBy$
 #$Date$
 

Modified: trunk/bootscripts/blfs/init.d/rpcbind
===================================================================
--- trunk/bootscripts/blfs/init.d/rpcbind       2011-12-05 05:42:37 UTC (rev 
9062)
+++ trunk/bootscripts/blfs/init.d/rpcbind       2011-12-05 07:38:40 UTC (rev 
9063)
@@ -12,10 +12,10 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            rpcbind
-# Required-Start:      network
+# Provides:            rpcbind $portmap
+# Required-Start:      $network
 # Should-Start:
-# Required-Stop:       sendsignals
+# Required-Stop:       $network
 # Should-Stop:
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
@@ -24,7 +24,7 @@
 #                      into DARPA protocol port numbers. It must be running in
 #                      order to make RPC# calls.  Replaces portmap, which does
 #                      not work with libtirpc.
-# X-LFS-Provided-By:   LFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions

Modified: trunk/bootscripts/blfs/init.d/svn
===================================================================
--- trunk/bootscripts/blfs/init.d/svn   2011-12-05 05:42:37 UTC (rev 9062)
+++ trunk/bootscripts/blfs/init.d/svn   2011-12-05 07:38:40 UTC (rev 9063)
@@ -2,7 +2,7 @@
 ########################################################################
 # Begin /etc/init.d/svn
 #
-# Description : Start sshd daemon
+# Description : Start Subversion server
 #
 # Author      : Bruce Dubbs - [email protected]
 #
@@ -11,16 +11,16 @@
 ########################################################################
 
 ### BEGIN INIT INFO
-# Provides:            $svnserve
-# Required-Start:      
-# Should-Start:
-# Required-Stop:       $sendsignals
-# Should-Stop:
+# Provides:            svn
+# Required-Start:      $network
+# Should-Start:        $remote_fs
+# Required-Stop:       $network
+# Should-Stop:         $remote_fs
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts subersion server.
 # Description:         Starts subversion version control system server daemon.
-# X-LFS-Provided-By:   LFS
+# X-LFS-Provided-By:   BLFS / LFS 7.0
 ### END INIT INFO
 
 . /lib/lsb/init-functions
@@ -29,32 +29,32 @@
 #$Date$
 
 case "$1" in
-       start)
-               log_info_msg "Starting Subversion..."
-               start_daemon /usr/bin/svnserve -d -r /srv/svn/repositories
-      evaluate_retval
+        start)
+                log_info_msg "Starting Subversion..."
+                start_daemon /usr/bin/svnserve -d -r /srv/svn/repositories
+                evaluate_retval
                ;;
 
-       stop)
-               log_info_msg "Stopping Subversion..."
-               killproc /usr/bin/svnserve.orig
-      evaluate_retval
-               ;;
+        stop)
+                log_info_msg "Stopping Subversion..."
+                killproc /usr/bin/svnserve.orig
+                evaluate_retval
+                ;;
 
-       restart)
-               $0 stop
-               sleep 1
-               $0 start
-               ;;
+        restart)
+                $0 stop
+                sleep 1
+                $0 start
+                ;;
 
-       status)
-               statusproc /usr/bin/svnserve.orig
-               ;;
+        status)
+                statusproc /usr/bin/svnserve.orig
+                ;;
 
-       *)
-               echo "Usage: $0 {start|stop|restart|status}"
-               exit 1
-               ;;
+        *)
+                echo "Usage: $0 {start|stop|restart|status}"
+                exit 1
+                ;;
 esac
 
 # End /etc/init.d/svn

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to