r8443 - in trunk/bootscripts/contrib/lsb-v3: . blfs/init.d

dj at linuxfromscratch.org dj at linuxfromscratch.org
Thu Jun 10 02:53:06 PDT 2010


Author: dj
Date: 2010-06-10 03:53:06 -0600 (Thu, 10 Jun 2010)
New Revision: 8443

Added:
   trunk/bootscripts/contrib/lsb-v3/blfs/init.d/slapd
Removed:
   trunk/bootscripts/contrib/lsb-v3/blfs/init.d/openldap1
Modified:
   trunk/bootscripts/contrib/lsb-v3/Changelog
   trunk/bootscripts/contrib/lsb-v3/Makefile
   trunk/bootscripts/contrib/lsb-v3/blfs/init.d/ntpd
   trunk/bootscripts/contrib/lsb-v3/blfs/init.d/samba
Log:
Several lsb-v3 boot script updates

Modified: trunk/bootscripts/contrib/lsb-v3/Changelog
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/Changelog	2010-06-10 08:01:40 UTC (rev 8442)
+++ trunk/bootscripts/contrib/lsb-v3/Changelog	2010-06-10 09:53:06 UTC (rev 8443)
@@ -1,3 +1,9 @@
+20100610  * [dj] - Added winbind to samba script.
+            [dj] - Renamed openldap1 to slapd
+            [dj] - Chaned provides for ntpd script to ntpd
+            [dj] - Fixed dependencies
+            [dj] - Fixed runlevels in httpd script
+
 20100428  * [dj] - Added netfs script.
           * [dj] - Added random script.
           * [dj] - Corrected deps on all scripts and cleand up comments.

Modified: trunk/bootscripts/contrib/lsb-v3/Makefile
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/Makefile	2010-06-10 08:01:40 UTC (rev 8442)
+++ trunk/bootscripts/contrib/lsb-v3/Makefile	2010-06-10 09:53:06 UTC (rev 8443)
@@ -75,9 +75,9 @@
 	install -m ${MODE} blfs/init.d/ntpd       ${EXTDIR}/init.d/
 	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/ntpd
 
-install-openldap1: create-dirs
-	install -m ${MODE} blfs/init.d/openldap1  ${EXTDIR}/init.d/openldap
-	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/openldap
+install-slapd: create-dirs
+	install -m ${MODE} blfs/init.d/slapd  ${EXTDIR}/init.d/slapd
+	/usr/lib/lsb/install_initd ${EXTDIR}/init.d/slapd
 
 install-postfix: create-dirs
 	install -m ${MODE} blfs/init.d/postfix    ${EXTDIR}/init.d/
@@ -108,7 +108,7 @@
 	install-named \
 	install-nas \
 	install-ntpd \
-	install-openldap1 \
 	install-postfix \
 	install-samba \
+	install-slapd \
 	install-sshd 

Modified: trunk/bootscripts/contrib/lsb-v3/blfs/init.d/ntpd
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/blfs/init.d/ntpd	2010-06-10 08:01:40 UTC (rev 8442)
+++ trunk/bootscripts/contrib/lsb-v3/blfs/init.d/ntpd	2010-06-10 09:53:06 UTC (rev 8443)
@@ -2,7 +2,7 @@
 # Begin /etc/init.d/ntpd
 
 ### BEGIN INIT INFO
-# Provides:            ntp
+# Provides:            ntpd
 # Required-Start:      $time $network
 # Should-Start:
 # Required-Stop:       $network

Deleted: trunk/bootscripts/contrib/lsb-v3/blfs/init.d/openldap1
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/blfs/init.d/openldap1	2010-06-10 08:01:40 UTC (rev 8442)
+++ trunk/bootscripts/contrib/lsb-v3/blfs/init.d/openldap1	2010-06-10 09:53:06 UTC (rev 8443)
@@ -1,53 +0,0 @@
-#!/bin/sh
-# Begin /etc/init.d/openldap
-
-### BEGIN INIT INFO
-# Provides:            openldap
-# Required-Start:      $network
-# Should-Start:
-# Required-Stop:       $network
-# Should-Stop:         $remote_fs
-# Default-Start:       3 4 5
-# Default-Stop:        0 1 2 6
-# Short-Description:   Starts OpenLDAP slapd.
-# Description:         Starts OpenLDAP slapd daemon.
-# X-LFS-Provided-By:   BLFS
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-MESSAGE="OpenLDAP slapd"
-BIN_FILE="/usr/sbin/slapd"
-PIDFILE="/srv/ldap/run/slapd.pid"
-
-case "$1" in
-    start)
-        start_daemon "${BIN_FILE}"
-        evaluate_retval start
-    ;;
-
-    stop)
-        # slapd needs SIGINT
-        killproc -p "${PIDFILE}" "${BIN_FILE}" -INT
-	evaluate_retval stop
-    ;;
-
-    restart)
-        killproc -p "${PIDFILE}" "${BIN_FILE}" -INT &&
-        sleep 1 &&
-        start_daemon "${BIN_FILE}"
-	evaluate_retval restart
-    ;;
-
-    status)
-        statusproc
-    ;;
-
-    *)
-        echo "Usage: $0 {start|stop|restart|status}"
-        exit 1
-    ;;
-
-esac
-
-# End /etc/init.d/openldap

Modified: trunk/bootscripts/contrib/lsb-v3/blfs/init.d/samba
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/blfs/init.d/samba	2010-06-10 08:01:40 UTC (rev 8442)
+++ trunk/bootscripts/contrib/lsb-v3/blfs/init.d/samba	2010-06-10 09:53:06 UTC (rev 8443)
@@ -4,9 +4,9 @@
 ### BEGIN INIT INFO
 # Provides:            samba
 # Required-Start:      $network
-# Should-Start:        $remote_fs cups 
+# Should-Start:        $remote_fs cups slapd ntpd
 # Required-Stop:       $network
-# Should-Stop:         $remote_fs cups
+# Should-Stop:         $remote_fs cups slapd ntpd
 # Default-Start:       3 4 5
 # Default-Stop:        0 1 2 6
 # Short-Description:   Provides SMB (Windows) networking.
@@ -26,6 +26,10 @@
         MESSAGE="smbd..."
         start_daemon /usr/sbin/smbd -D
         evaluate_retval start
+
+#        MESSAGE="winbind..."
+#        start_daemon /usr/sbin/winbindd
+#        evaluate_retval start
     ;;
 
     stop)
@@ -36,6 +40,10 @@
         MESSAGE="nmbd..."
         killproc /usr/sbin/nmbd
         evaluate_retval stop
+
+#        MESSAGE="winbind..."
+#        killproc /usr/sbin/winbindd
+#        evaluate_retval stop
     ;;
 
 	reload)
@@ -46,6 +54,10 @@
         MESSAGE="nmbd..."
         killproc -HUP /usr/sbin/nmbd
         evlauate_retval reload
+
+#        MESSAGE="winbind..."
+#        killproc -HUP /usr/sbin/winbindd
+#        evaluate_retval reload
     ;;
 
     restart)

Added: trunk/bootscripts/contrib/lsb-v3/blfs/init.d/slapd
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/blfs/init.d/slapd	                        (rev 0)
+++ trunk/bootscripts/contrib/lsb-v3/blfs/init.d/slapd	2010-06-10 09:53:06 UTC (rev 8443)
@@ -0,0 +1,53 @@
+#!/bin/sh
+# Begin /etc/init.d/slapd
+
+### BEGIN INIT INFO
+# Provides:            slapd
+# Required-Start:      $network
+# Should-Start:        $remote_fs ntpd
+# Required-Stop:       $network
+# Should-Stop:         $remote_fs ntpd
+# Default-Start:       3 4 5
+# Default-Stop:        0 1 2 6
+# Short-Description:   Starts OpenLDAP slapd.
+# Description:         Starts OpenLDAP slapd daemon.
+# X-LFS-Provided-By:   BLFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+MESSAGE="OpenLDAP slapd"
+BIN_FILE="/usr/sbin/slapd"
+PIDFILE="/srv/ldap/run/slapd.pid"
+
+case "$1" in
+    start)
+        start_daemon "${BIN_FILE}"
+        evaluate_retval start
+    ;;
+
+    stop)
+        # slapd needs SIGINT
+        killproc -p "${PIDFILE}" "${BIN_FILE}" -INT
+	evaluate_retval stop
+    ;;
+
+    restart)
+        killproc -p "${PIDFILE}" "${BIN_FILE}" -INT &&
+        sleep 1 &&
+        start_daemon "${BIN_FILE}"
+	evaluate_retval restart
+    ;;
+
+    status)
+        statusproc
+    ;;
+
+    *)
+        echo "Usage: $0 {start|stop|restart|status}"
+        exit 1
+    ;;
+
+esac
+
+# End /etc/init.d/slapd




More information about the blfs-book mailing list