r4217 - in trunk/bootscripts: . lfs/init.d

nathan at linuxfromscratch.org nathan at linuxfromscratch.org
Sun Sep 26 22:35:25 PDT 2004


Author: nathan
Date: 2004-09-26 23:35:23 -0600 (Sun, 26 Sep 2004)
New Revision: 4217

Modified:
   trunk/bootscripts/CHANGELOG
   trunk/bootscripts/Makefile
   trunk/bootscripts/lfs/init.d/functions
   trunk/bootscripts/lfs/init.d/udev
Log:
Removed /dev/.udev.tdb test, added BOOTMESG_PREFIX variable

Modified: trunk/bootscripts/CHANGELOG
===================================================================
--- trunk/bootscripts/CHANGELOG	2004-09-26 16:29:05 UTC (rev 4216)
+++ trunk/bootscripts/CHANGELOG	2004-09-27 05:35:23 UTC (rev 4217)
@@ -1,3 +1,10 @@
+n/a - September 26, 2004
+	* Added BOOTMESG_PREFIX variable, so users can optionally set a
+	  prefix for boot messages (James Robert)
+
+n/a - September 24, 2004
+	* Removed /dev/udev.tdb test
+
 n/a - September 23, 2004
 	* Fixed boot_log so it output's $@'s contents, not @$
 	* Added support for colors in boot_mesg (James Robertson)

Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile	2004-09-26 16:29:05 UTC (rev 4216)
+++ trunk/bootscripts/Makefile	2004-09-27 05:35:23 UTC (rev 4217)
@@ -93,6 +93,7 @@
 
 install-syslog-ng: create-dirs
 	install -m ${MODE} contrib/init.d/syslog-ng	${EXTDIR}/rc.d/init.d
+	rm -f  ${EXTDIR}/sysconfig/sysklogd
 	rm -rf ${EXTDIR}/rc.d/init.d/sysklogd
 	rm -rf ${EXTDIR}/rc.d/rc{0,1,2,6}.d/K90sysklogd
 	rm -rf ${EXTDIR}/rc.d/rc{3,4,5}.d/S10sysklogd

Modified: trunk/bootscripts/lfs/init.d/functions
===================================================================
--- trunk/bootscripts/lfs/init.d/functions	2004-09-26 16:29:05 UTC (rev 4216)
+++ trunk/bootscripts/lfs/init.d/functions	2004-09-27 05:35:23 UTC (rev 4217)
@@ -43,11 +43,14 @@
 INFO="\\033[1;36m"           # Information is light cyan
 BRACKET="\\033[1;34m"        # Brackets are blue
 
+BOOTMESG_PREFIX=""           # Text at the beginning of every line
+
 # Set screen and bootlog message values to ero
 BOOTMESG=""    #buffer for text meant for the logfile
 BOOTMESGCON="" #buffer for text meant for the console
 BOOTSERVICE=""
 
+
 #*******************************************************************************
 # Function - boot_mesg()
 #
@@ -55,7 +58,7 @@
 #
 # Inputs:       $1 is the message
 #               $2 is the colorcode for the console
-#
+
 # Outputs:      Standard Output
 #
 # Dependencies: - grep, for counting \n's in a variable
@@ -73,7 +76,7 @@
 {
 	# First call to boot_mesg, set BOOTMESG normally
 	if [ -z "$BOOTMESG" ]; then
-		BOOTMESG="${1}"
+		BOOTMESG="${BOOTMESG_PREFIX} \b${1}"
 		BOOTMESGCON="${2}${1}"
 	# Subsequent calls will overwrite the text already on the screen
 	# with replacement text by counting the lines in the last BOOTMESG
@@ -82,7 +85,7 @@
 	else
 		local length=`echo -e "$BOOTMESGCON" | sed -n -e "s/\$/\n/g;L ${WCOL}" |grep -c \$`
 		local count=0
-		BOOTMESG="${BOOTMESG}${1}"
+		BOOTMESG="${BOOTMESG} \b${1}"
 		BOOTMESGCON="${BOOTMESGCON} \b${2} \b${1}"
 		while [ "${count}" -lt "${length}" ]; do
 			echo -e -n "$CURS_UP"

Modified: trunk/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/bootscripts/lfs/init.d/udev	2004-09-26 16:29:05 UTC (rev 4216)
+++ trunk/bootscripts/lfs/init.d/udev	2004-09-27 05:35:23 UTC (rev 4217)
@@ -20,10 +20,6 @@
 
 case "$1" in
 	start)
-		# Don't attempt to populate the /dev directory when something
-		# else has already set it up.
-		[ -f /dev/.udev.tdb ] && exit 0
-
 		boot_mesg "Populating /dev with device nodes..."
 		if ! grep -q '[[:space:]]sysfs' /proc/mounts ; then
 			boot_log " sysfs filesystem not found.  Unable to continue"




More information about the lfs-book mailing list