Author: dj
Date: 2010-04-27 21:46:23 -0600 (Tue, 27 Apr 2010)
New Revision: 9259
Modified:
trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
trunk/BOOK/bootscripts/contrib/lsb-v3/README
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/console
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/halt
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/modules
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountkernfs
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/network
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/reboot
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sendsignals
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/swap
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysctl
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysklogd
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/template
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev
trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry
Log:
fixed paths and removed unneeded X-LFS-Default lines.
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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.
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/README
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/README 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/README 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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 @@
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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/checkfs 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/cleanfs 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/console
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/console 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/console 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/halt
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/halt 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/halt 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/localnet 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/modules
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/modules 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/modules 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountfs 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountfs 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountkernfs
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountkernfs 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/mountkernfs 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/network
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/network 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/network 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/reboot
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/reboot 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/reboot 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sendsignals
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sendsignals 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sendsignals 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/swap
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/swap 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/swap 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysctl
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysctl 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysctl 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysklogd
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysklogd 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/sysklogd 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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
;;
*)
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/template
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/template 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/template 2010-04-28
03:46:23 UTC (rev 9259)
@@ -11,8 +11,6 @@
# Default-Stop:
# Short-Description:
# Description:
-# X-LFS-Default-Start:
-# X-LFS-Default-Stop:
# X-LFS-Provided-By:
### END INIT INFO
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev 2010-04-23 17:50:25 UTC
(rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev 2010-04-28 03:46:23 UTC
(rev 9259)
@@ -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
Modified: trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry
===================================================================
--- trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry 2010-04-23
17:50:25 UTC (rev 9258)
+++ trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev_retry 2010-04-28
03:46:23 UTC (rev 9259)
@@ -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 @@
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
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
