Changeset 8953f24

Timestamp:

Sep 24, 2006, 12:22:14 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

576135a

Parents:

040521bc

Message:

Readded Bootlog to bootscripts

Location:

bootscripts

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (3 diffs)
• lfs/init.d/functions (modified) (5 diffs)
• lfs/sysconfig/bootscripts (modified) (2 diffs)

bootscripts/Changelog

@@ +1 @@
+jim - September 24, 2006
+        * Changed LFS to CLFS
+        * Added Logging Feature back to the bootscripts
+
 jim - September 2, 2006
         * Add a check to see if the interface is already disabled
-
-jim - September 2, 2006
         * Add a check to see if the interface is already setup
 

bootscripts/Makefile

@@ -75 +75 @@
         ln -sf ../init.d/localnet    ${EXTDIR}/rc.d/rcsysinit.d/S80localnet
         ln -sf ../init.d/sysctl      ${EXTDIR}/rc.d/rcsysinit.d/S90sysctl
+        if [ ! -f ${EXTDIR}/sysconfig/bootscripts ]; then install -m ${CONFMODE} lfs/sysconfig/bootscripts ${EXTDIR}/sysconfig/bootscripts; fi
         if [ ! -f ${EXTDIR}/sysconfig/console     ]; then install -m ${CONFMODE} lfs/sysconfig/console     ${EXTDIR}/sysconfig/; fi
         if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} lfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
@@ -132 +133 @@
         ln -sf ../init.d/paneld      ${EXTDIR}/rc.d/rc5.d/S99paneld
         ln -sf ../init.d/paneld      ${EXTDIR}/rc.d/rc6.d/K01paneld
-        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd-raq2          ${EXTDIR}/sysconfig/lcd; fi
+        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd-raq2   ${EXTDIR}/sysconfig/lcd; fi
 
 install-raq3: 
@@ -143 +144 @@
         ln -sf ../init.d/setlcd      ${EXTDIR}/rc.d/rc5.d/S99setlcd
         ln -sf ../init.d/setlcd      ${EXTDIR}/rc.d/rc6.d/K01setlcd
-        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd-raq3          ${EXTDIR}/sysconfig/lcd; fi
+        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd-raq3   ${EXTDIR}/sysconfig/lcd; fi
 
 install-lcd: 
-        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd              ${EXTDIR}/sysconfig/lcd; fi
+        if [ ! -f ${EXTDIR}/sysconfig/lcd          ]; then install -m ${CONFMODE} lfs/sysconfig/lcd        ${EXTDIR}/sysconfig/lcd; fi
 
 .PHONY: all create-dirs create-service-dir install install-consolelog \

bootscripts/lfs/init.d/functions

@@ -128 +128 @@
         # Reset STRING_LENGTH for next message
         STRING_LENGTH="0"
+        if [ "$LOGGING" ]; then
+                boot_log "${BOOTMESG}${@}"
+        fi
 }
 
 boot_log()
 {
-        # Left in for backwards compatibility
-        echo -n ""
+        if [ "$LOGGING" ]; then
+                /bin/logger -p local2.info -t bootlog "${@}"
+        else
+                return 0
+        fi
 }
 
@@ -197 +203 @@
         boot_mesg -n "If you're able to track this"
         boot_mesg -n " error down to a bug in one of the files provided by"
-        boot_mesg -n " the LFS book, please be so kind to inform us at"
-        boot_mesg " lfs-dev@linuxfromscratch.org.\n"
+        boot_mesg -n " the CLFS book, please be so kind to inform us at"
+        boot_mesg " clfs-dev@cross-lfs.org.\n"
         boot_mesg_flush
         if [ "$INTERACTIVE" ]; then
@@ -452 +458 @@
 }
 
-# This will ensure compatibility with previous LFS Bootscripts
+# This will ensure compatibility with previous CLFS Bootscripts
 getpids()
 {
@@ -494 +500 @@
         local nicelevel="10"
 
-# This will ensure compatibility with previous LFS Bootscripts
+# This will ensure compatibility with previous CLFS Bootscripts
         if [ -n "${PIDFILE}" ]; then
                 pidfile="${PIDFILE}"
@@ -586 +592 @@
         pidlist=""
 
-# This will ensure compatibility with previous LFS Bootscripts
+# This will ensure compatibility with previous CLFS Bootscripts
         if [ -n "${PIDFILE}" ]; then
                 pidfile="${PIDFILE}"

bootscripts/lfs/sysconfig/bootscripts

@@ -2 +2 @@
 # Begin /etc/sysconfig/bootscripts
 #
-# Description : LCD Screen Control
+# Description : Bootscripts Config System
 #
 # Authors     :
@@ -17 +17 @@
 INTERACTIVE=y
 
+# Enable/disable Logging of bootup
+# Enable        - LOGGING=y
+# Disable       - LOGGING=
+LOGGING=y
+
 # End /etc/sysconfig/bootscripts