fixed paths and removed unneeded X-LFS-Default lines.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9259 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

20 files changed, 21 insertions, 49 deletions

diff --git a/bootscripts/contrib/lsb-v3/ChangeLog b/bootscripts/contrib/lsb-v3/ChangeLog
index 6230e4bbf..6e4e91f7e 100644
--- a/bootscripts/contrib/lsb-v3/ChangeLog
+++ b/bootscripts/contrib/lsb-v3/ChangeLog
@@ -1,4 +1,8 @@
 ChangeLog
+20100427 - [dj] * Removed unneeded X-LFS-Default* lines.
+                * Corrected udev_retry script for new udev.
+                * Corrected path of syslogd and klogd in sysklogd script.
+
 20090325 - [dj] * Corrected serveral echo commands missing -e - Thanks to
                   Michael Tremer at IPFire for the corrections.
 
diff --git a/bootscripts/contrib/lsb-v3/README b/bootscripts/contrib/lsb-v3/README
index 47930627e..1b061f5d1 100644
--- a/bootscripts/contrib/lsb-v3/README
+++ b/bootscripts/contrib/lsb-v3/README
@@ -1,7 +1,7 @@
 LSB-V3 README
 
 The scripts contianed in this directory are a complete rewrite of the
-boot scripts from LFS-6.1 (updated for LFS-SVN about 2008-05-31).  As is
+boot scripts from LFS-6.1 (updated for LFS-SVN about 2010-04-28).  As is
 usually the case with a rewrite, there have been many changes:
 
 AS OF 20080907, THESE SCRIPTS REQUIRE THE NEW initd-tools PACKAGE.
@@ -86,6 +86,10 @@ the best of my ability, but there probably are some hidden bugs that will
 come to lite when used more frequently.  Please give me a shout _when_ you
 find them.
 
+The sysctl script runs much earlier in the boot process, as a result, it
+negates the need for the consolelog script.  Set 'kernel.printk = X' in your
+/etc/sysctl.conf file for equivalent functionality.
+
 Thanks.
 
 -- DJ Lucas
diff --git a/bootscripts/contrib/lsb-v3/init.d/checkfs b/bootscripts/contrib/lsb-v3/init.d/checkfs
index 5390f7300..a8a1b6c60 100644
--- a/bootscripts/contrib/lsb-v3/init.d/checkfs
+++ b/bootscripts/contrib/lsb-v3/init.d/checkfs
@@ -11,8 +11,6 @@
 # Default-Stop:
 # Short-Description:   Checks local filesystems before mounting.
 # Description:         Checks local filesystmes before mounting.
-# X-LFS-Default-Start: S30
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/cleanfs b/bootscripts/contrib/lsb-v3/init.d/cleanfs
index 23fa9b1a3..61a1fb512 100644
--- a/bootscripts/contrib/lsb-v3/init.d/cleanfs
+++ b/bootscripts/contrib/lsb-v3/init.d/cleanfs
@@ -13,8 +13,6 @@
 # Description:         Cleans temporary directories /var/run, /var/lock, and
 #                      /tmp.  cleanfs also creates /var/run/utmp and any files 
 #                      defined in /etc/sysconfig/createfiles.
-# X-LFS-Default-Start: S50
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/console b/bootscripts/contrib/lsb-v3/init.d/console
index dc8bd837b..8b26f57d5 100644
--- a/bootscripts/contrib/lsb-v3/init.d/console
+++ b/bootscripts/contrib/lsb-v3/init.d/console
@@ -12,8 +12,6 @@
 # Short-Description:   Sets up a localised console.
 # Description:         Sets up fonts and language settings for the user's 
 #                      local as defined by /etc/sysconfig/console.
-# X-LFS-Default-Start: S70
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/halt b/bootscripts/contrib/lsb-v3/init.d/halt
index da933a127..cdcd90778 100644
--- a/bootscripts/contrib/lsb-v3/init.d/halt
+++ b/bootscripts/contrib/lsb-v3/init.d/halt
@@ -11,8 +11,6 @@
 # Default-Stop:
 # Short-Description:   Halts the system.
 # Description:         Halts the System.
-# X-LFS-Default-Start:
-# X-LFS-Default-Stop:  S99
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/localnet b/bootscripts/contrib/lsb-v3/init.d/localnet
index 6dae531a0..7e520bbe4 100644
--- a/bootscripts/contrib/lsb-v3/init.d/localnet
+++ b/bootscripts/contrib/lsb-v3/init.d/localnet
@@ -12,8 +12,6 @@
 # Short-Description:   Starts the local network.
 # Description:         Sets the hostname of the machine and starts the 
 #                      loopback interface.
-# X-LFS-Default-Start: S80
-# X-LFS-Default-Stop:  S90
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/modules b/bootscripts/contrib/lsb-v3/init.d/modules
index 35cb9f2d4..b233cf46d 100644
--- a/bootscripts/contrib/lsb-v3/init.d/modules
+++ b/bootscripts/contrib/lsb-v3/init.d/modules
@@ -11,8 +11,6 @@
 # Default-Stop:
 # Short-Description:   Loads required modules.
 # Description:         Loads modules listed in /etc/sysconfig/modules.
-# X-LFS-Default-Start: S10
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/mountfs b/bootscripts/contrib/lsb-v3/init.d/mountfs
index eeaac95de..2e03db582 100644
--- a/bootscripts/contrib/lsb-v3/init.d/mountfs
+++ b/bootscripts/contrib/lsb-v3/init.d/mountfs
@@ -14,8 +14,6 @@
 #                      remaining local filesystems defined in /etc/fstab on
 #                      start.  Remounts root filesystem read-only and unmounts
 #                      remaining filesystems on stop.
-# X-LFS-Default-Start: S40
-# X-LFS-Default-Stop:  S70
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/mountkernfs b/bootscripts/contrib/lsb-v3/init.d/mountkernfs
index aa985b976..7366f0bf1 100644
--- a/bootscripts/contrib/lsb-v3/init.d/mountkernfs
+++ b/bootscripts/contrib/lsb-v3/init.d/mountkernfs
@@ -11,8 +11,6 @@
 # Default-Stop:
 # Short-Description:   Mounts /sys and /proc virtual (kernel) filesystems.
 # Description:         Mounts /sys and /proc virtual (kernel) filesystems.
-# X-LFS-Default-Start: S00
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/network b/bootscripts/contrib/lsb-v3/init.d/network
index 22114a6d3..29d4d54c8 100644
--- a/bootscripts/contrib/lsb-v3/init.d/network
+++ b/bootscripts/contrib/lsb-v3/init.d/network
@@ -11,8 +11,6 @@
 # Default-Stop:        0 1 2 6
 # Short-Description:   Starts and configures network interfaces.
 # Description:         Starts and configures network interfaces.
-# X-LFS-Default-Start: S20
-# X-LFS-Default-Stop:  K80
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/reboot b/bootscripts/contrib/lsb-v3/init.d/reboot
index 0de939aca..56e948a3f 100644
--- a/bootscripts/contrib/lsb-v3/init.d/reboot
+++ b/bootscripts/contrib/lsb-v3/init.d/reboot
@@ -11,8 +11,6 @@
 # Default-Stop:
 # Short-Description:   Reboots the system.
 # Description:         Reboots the System.
-# X-LFS-Default-Start:
-# X-LFS-Default-Stop:  S99
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/sendsignals b/bootscripts/contrib/lsb-v3/init.d/sendsignals
index e48e19fb7..754e1cb1f 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sendsignals
+++ b/bootscripts/contrib/lsb-v3/init.d/sendsignals
@@ -11,8 +11,6 @@
 # Default-Stop:        0 6
 # Short-Description:   Attempts to kill remaining processes.
 # Description:         Attempts to kill remaining processes.
-# X-LFS-Default-Start:
-# X-LFS-Default-Stop:  S60
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/setclock b/bootscripts/contrib/lsb-v3/init.d/setclock
index 41da77b45..2acceaa92 100644
--- a/bootscripts/contrib/lsb-v3/init.d/setclock
+++ b/bootscripts/contrib/lsb-v3/init.d/setclock
@@ -12,8 +12,6 @@
 # Short-Description:   Stores and restores time from the hardware clock
 # Description:         On boot, system time is obtained from hwclock.  The
 #                      hardware clock can also be set on shutdown.
-# X-LFS-Default-Start: S25
-# X-LFS-Default-Stop:  K46
 # X-LFS-Provided-By:   LFS BLFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/swap b/bootscripts/contrib/lsb-v3/init.d/swap
index d62702848..7b999e6fe 100644
--- a/bootscripts/contrib/lsb-v3/init.d/swap
+++ b/bootscripts/contrib/lsb-v3/init.d/swap
@@ -12,8 +12,6 @@
 # Short-Description:   Mounts and unmounts swap partitions.
 # Description:         Mounts and unmounts swap partitions defined in 
 #                      /etc/fstab.
-# X-LFS-Default-Start: S20
-# X-LFS-Default-Stop:  S80
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/sysctl b/bootscripts/contrib/lsb-v3/init.d/sysctl
index cbae2408b..813467117 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sysctl
+++ b/bootscripts/contrib/lsb-v3/init.d/sysctl
@@ -12,8 +12,6 @@
 # Short-Description:   Makes changes to the proc filesystem
 # Description:         Makes changes to the proc filesystem as defined in
 #                      /etc/sysctl.conf.  See 'man sysctl(8)'.
-# X-LFS-Default-Start: S05
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/sysklogd b/bootscripts/contrib/lsb-v3/init.d/sysklogd
index ac73c76ce..dc8829f07 100644
--- a/bootscripts/contrib/lsb-v3/init.d/sysklogd
+++ b/bootscripts/contrib/lsb-v3/init.d/sysklogd
@@ -12,8 +12,6 @@
 # Short-Description:   Starts kernel and system log daemons.
 # Description:         Starts kernel and system log daemons.
 #                      /etc/fstab.
-# X-LFS-Default-Start: S10
-# X-LFS-Default-Stop:  K90
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
@@ -22,44 +20,44 @@
 case "${1}" in
     start)
         MESSAGE="system log daemon..."
-        start_daemon /usr/sbin/syslogd -m 0
+        start_daemon /sbin/syslogd -m 0
         evaluate_retval start
 
         MESSAGE="kernel log daemon..."
-        start_daemon /usr/sbin/klogd
+        start_daemon /sbin/klogd
         evaluate_retval start
         ;;
 
     stop)
         MESSAGE="kernel log daemon..."
-        killproc /usr/sbin/klogd
+        killproc /sbin/klogd
         evaluate_retval stop
 
         MESSAGE="system log daemon..."
-        killproc /usr/sbin/syslogd
+        killproc /sbin/syslogd
         evaluate_retval stop
         ;;
 
     force-reload)
         MESSAGE="system log daemon config file..."
-        killproc -HUP `/usr/sbin/syslogd`
+        killproc -HUP `/sbin/syslogd`
         evaluate_retval reload
         ;;
 
     restart)
         MESSAGE="system and kernel log deamons..."
         failed=0
-        killproc /usr/sbin/klogd || failed=1
-        killproc /usr/sbin/syslogd || failed=1
-        start_daemon /usr/sbin/syslogd -m 0 || failed=1
-        start_daemon /usr/sbin/klogd || failed=1
+        killproc /sbin/klogd || failed=1
+        killproc /sbin/syslogd || failed=1
+        start_daemon /sbin/syslogd -m 0 || failed=1
+        start_daemon /sbin/klogd || failed=1
         (exit ${failed})
         evaluate_retval restart
         ;;
 
     status)
-        statusproc /usr/sbin/syslogd
-        statusproc /usr/sbin/klogd
+        statusproc /sbin/syslogd
+        statusproc /sbin/klogd
         ;;
 
     *)
diff --git a/bootscripts/contrib/lsb-v3/init.d/template b/bootscripts/contrib/lsb-v3/init.d/template
index 24a9e7f93..cb3222a35 100644
--- a/bootscripts/contrib/lsb-v3/init.d/template
+++ b/bootscripts/contrib/lsb-v3/init.d/template
@@ -11,8 +11,6 @@
 # Default-Stop:
 # Short-Description:
 # Description: 
-# X-LFS-Default-Start:
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev b/bootscripts/contrib/lsb-v3/init.d/udev
index 3e95f9cb3..fa3e71006 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev
+++ b/bootscripts/contrib/lsb-v3/init.d/udev
@@ -12,8 +12,6 @@
 # Short-Description:   Populated /dev with device nodes.
 # Description:         Mounts a tempfs on /dev and starts the udevd daemon.
 #                      Device nodes are created as defined by udev.
-# X-LFS-Default-Start: S15
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
diff --git a/bootscripts/contrib/lsb-v3/init.d/udev_retry b/bootscripts/contrib/lsb-v3/init.d/udev_retry
index df70132eb..53df4d5c1 100644
--- a/bootscripts/contrib/lsb-v3/init.d/udev_retry
+++ b/bootscripts/contrib/lsb-v3/init.d/udev_retry
@@ -13,8 +13,6 @@
 # Description:         Replays any failed uevents that were skipped due to
 #                      slow hardware initialization, and creates those needed
 #                      device nodes
-# X-LFS-Default-Start: S45
-# X-LFS-Default-Stop:
 # X-LFS-Provided-By:   LFS
 ### END INIT INFO
 
@@ -35,7 +33,7 @@ case "${1}" in
                 done
 
                 # Re-trigger the failed uevents in hope they will succeed now
-                /sbin/udevadm trigger --retry-failed
+                /sbin/udevadm trigger --type=failed
 
 		# Now wait for udevd to process the uevents we triggered
 		/sbin/udevadm settle