Changeset 8558

Timestamp:

09/07/08 10:27:29 (3 months ago)

Author:

dj

Message:

Use new initd-tools package, store log times in UTC, use soft depenendencies for minimal install target

Files:

• trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog (modified) (1 diff)
• trunk/BOOK/bootscripts/contrib/lsb-v3/INSTALL (modified) (1 diff)
• trunk/BOOK/bootscripts/contrib/lsb-v3/Makefile (modified) (4 diffs)
• trunk/BOOK/bootscripts/contrib/lsb-v3/README (modified) (3 diffs)
• trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/network (modified) (1 diff)
• trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock (modified) (1 diff)
• trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/swap (modified) (1 diff)
• trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev (modified) (1 diff)
• trunk/BOOK/bootscripts/contrib/lsb-v3/lsb/init-functions (modified) (3 diffs)

trunk/BOOK/bootscripts/contrib/lsb-v3/ChangeLog

@@ -1 +1 @@
-ChangeLog
+
+20080907 - [dj] * Use new initd-tools package to activate scripts.
+                * $syslog and modules services cannot be a hard dependencies
+                  due to minimal install target.
+                * Store bootlog date in UTC.
+
-20080831 - [dj] * Corrected more, and minimized dependencies in scripts.
-                * Don't try to write to bootlog in 0 and 6.

trunk/BOOK/bootscripts/contrib/lsb-v3/INSTALL

@@ -1 +1 @@
-LSB-V3 Installation:
-
-
-
+
-
+initd-tools installation:
-
-
-
-
-
-
-
-
+
+
-
+        ./configure &&
+        make &&
+        make check &&
+        make install
+    
+Inline installation of lsb-v3 bootscripts:
+        sudo make install
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-That's it!

trunk/BOOK/bootscripts/contrib/lsb-v3/Makefile

@@ -28 +28 @@
-
-install: create-dirs create-service-dir create-boottemp-dir
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
-        if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then install -m ${CONFMODE} sysconfig/modules     ${EXTDIR}/sysconfig/; fi
-        if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} sysconfig/rc          ${EXTDIR}/sysconfig/; fi
-        if [ ! -f ${EXTDIR}/sysconfig/rc.site     ]; then install -m ${CONFMODE} sysconfig/rc.site     ${EXTDIR}/sysconfig/; fi
-
+ fi
-        install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
-        install                   -m ${MODE} sysconfig/network-devices/ifup   ${EXTDIR}/sysconfig/network-devices/
@@ -97 +61 @@
-        install                   -m ${MODE} sysconfig/network-devices/services/ipv4-static       ${EXTDIR}/sysconfig/network-devices/services/
-        install                   -m ${MODE} sysconfig/network-devices/services/ipv4-static-route ${EXTDIR}/sysconfig/network-devices/services/
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs.sh
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/cleanfs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/halt
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/console-screen-kbd.sh
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/localnet
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/modules
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/mountfs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/mountkernfs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/network
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/reboot
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/sendsigs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/setclock
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/sysklogd
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/swap
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/sysctl
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev_retry
-
-minimal: create-dirs create-service-dir create-boottemp-dir
-   
+.sh
-        install -m ${MODE} init.d/cleanfs           ${EXTDIR}/init.d/
-        install -m ${CONFMODE} init.d/lfs-functions ${EXTDIR}/init.d/
@@ -108 +89 @@
-        install -m ${MODE} init.d/rc                ${EXTDIR}/init.d/
-        install -m ${MODE} init.d/reboot            ${EXTDIR}/init.d/
-nal
+
-        install -m ${MODE} init.d/setclock          ${EXTDIR}/init.d/
-        install -m ${MODE} init.d/swap              ${EXTDIR}/init.d/
@@ -115 +96 @@
-        install -m ${CONFMODE} lsb/manage-functions ${DESTDIR}/lib/lsb/
-        install -m ${CONFMODE} etc/lsb-config       ${EXTDIR}/lsb/
-        ln -sf ../init.d/sendsignals ${EXTDIR}/rc0.d/S60sendsignals
-        ln -sf ../init.d/mountfs     ${EXTDIR}/rc0.d/S70mountfs
-        ln -sf ../init.d/swap        ${EXTDIR}/rc0.d/S80swap
-        ln -sf ../init.d/halt        ${EXTDIR}/rc0.d/S99halt
-        ln -sf ../init.d/sendsignals ${EXTDIR}/rc6.d/S60sendsignals
-        ln -sf ../init.d/mountfs     ${EXTDIR}/rc6.d/S70mountfs
-        ln -sf ../init.d/swap        ${EXTDIR}/rc6.d/S80swap
-        ln -sf ../init.d/reboot      ${EXTDIR}/rc6.d/S99reboot
-        ln -sf ../init.d/mountkernfs ${EXTDIR}/rcS.d/S00mountkernfs
-        ln -sf ../init.d/udev        ${EXTDIR}/rcS.d/S10udev
-        ln -sf ../init.d/swap        ${EXTDIR}/rcS.d/S20swap
-        ln -sf ../init.d/setclock    ${EXTDIR}/rcS.d/S25setclock
-        ln -sf ../init.d/checkfs     ${EXTDIR}/rcS.d/S30checkfs
-        ln -sf ../init.d/mountfs     ${EXTDIR}/rcS.d/S40mountfs
-        ln -sf ../init.d/cleanfs     ${EXTDIR}/rcS.d/S50cleanfs
-        if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} sysconfig/rc          ${EXTDIR}/sysconfig/; fi
+        if [ -f   ${EXTDIR}/inittab               ]; then install -m ${CONFMODE} ${EXTDIR}/inittab     ${EXTDIR}/inittab.bak; fi
+        install                   -m ${CONFMODE} etc/inittab ${EXTDIR}/
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/checkfs.sh
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/cleanfs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/halt
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/localnet
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/mountfs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/mountkernfs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/reboot
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/sendsigs
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/setclock
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/swap
+        /usr/lib/lsb/install_initd ${EXTDIR}/init.d/udev
-
-.PHONY: all create-dirs create-service-dir create-boottemp-dir \

trunk/BOOK/bootscripts/contrib/lsb-v3/README

@@ -5 +5 @@
-usually the case with a rewrite, there have been many changes:
-
-
+
+
+
+
+
+
-in the rc.d scripts themselves.  Each script contains a usable header to
-allow for automating both the installation of, and determining proper
@@ -15 +20 @@
-the messages are created from parts and only written to the screen in a
-single command, so maybe no help at all WRT translated boot messages.
-
-LSB 3.1 Omissions - Unfortunately, this package is not completely LSB
-compliant as it lacks install_initd and remove_initd programs.  The current
-popular flavor of these programs is written in Python, which, as you should
-know, is not installed until BLFS.  I began work on a bash implementation,
-and have provided the needed functions to parse the LSB headers in the
-manage-functions script (insalled by default into /lib/lsb).  Unfortunately,
-I have yet to complete the actual install_initd and remove_initd scripts,
-and have found bash to an unsuitable language to write a complete reorder
-due to the ammount of time for recursive funtions and loops to complete.
-Dan Nicholson has began work on initd-tools, a C implementaion of
-install_initd and remove_initd.  At the time of writing (20080830) the
-programs themselves are not yet functional, however, the libraries used
-to parse the scripts and provide the dependency order are working as
-expected.  I would expect a completely standards compliant set of programs,
-written in C very soon. Dans work can be viewed via git-web at
-http://gitweb.dwcab.com/?p=initd-tools.git;a=summary .
-
-Distribution Independent - this original goal for the LFS scripts has been
@@ -70 +58 @@
-flying fingers accustomed to it!  Of course, this is still configurable in
-/etc/sysconfig/rc.site, and if the change is too great, I'll put it back.
-
+directory 
-
-LSB Functions - The previous lfs-bootscripts sourced a functions file

trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/network

@@ -4 +4 @@
-### BEGIN INIT INFO
-# Provides:            $network
-      $syslog
-
-syslog $
-
+
+        $syslog
+
+         $syslog
-# Default-Start:       3 4 5
-# Default-Stop:        0 1 2 6

trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/setclock

@@ -4 +4 @@
-### BEGIN INIT INFO
-# Provides:            $time
-      modules
-
-       $syslog
-
+
+        modules
+
+         $syslog
-# Default-Start:       S
-# Default-Stop: 

trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/swap

@@ -4 +4 @@
-### BEGIN INIT INFO
-# Provides:            swap
-      modules
-
+
+        modules
-# Required-Stop:       localnet
-# Should-Stop:

trunk/BOOK/bootscripts/contrib/lsb-v3/init.d/udev

@@ -4 +4 @@
-### BEGIN INIT INFO
-# Provides:            udev
-      modules
-
+
+        modules
-# Required-Stop:
-# Should-Stop:

trunk/BOOK/bootscripts/contrib/lsb-v3/lsb/init-functions

@@ -448 +448 @@
-            BTTIMESPEC=""
-        else
-
+-u 
-        fi
-        echo "${BTTIMESPEC}bootlog: ${@} Successful" >> "${TEMPFS_MOUNT}/.bootlog"
@@ -475 +475 @@
-            BTTIMESPEC=""
-        else
-
+-u 
-        fi
-        echo "${BTTIMESPEC}bootlog: ${@} Failed!" >> "${TEMPFS_MOUNT}/.bootlog"
@@ -502 +502 @@
-            BTTIMESPEC=""
-        else
-
+-u 
-        fi
-        echo "${BTTIMESPEC}bootlog: ${@} Warning" >> "${TEMPFS_MOUNT}/.bootlog"