r7447 - in branches/udev_update/bootscripts: . lfs/init.d

dj at linuxfromscratch.org dj at linuxfromscratch.org
Tue Mar 21 17:04:34 PST 2006


Author: dj
Date: 2006-03-21 18:04:34 -0700 (Tue, 21 Mar 2006)
New Revision: 7447

Modified:
   branches/udev_update/bootscripts/CHANGELOG
   branches/udev_update/bootscripts/lfs/init.d/functions
   branches/udev_update/bootscripts/lfs/init.d/rc
   branches/udev_update/bootscripts/lfs/init.d/udev
Log:
removed old syntax in echo_* functions and references to boot_log

Modified: branches/udev_update/bootscripts/CHANGELOG
===================================================================
--- branches/udev_update/bootscripts/CHANGELOG	2006-03-22 01:02:32 UTC (rev 7446)
+++ branches/udev_update/bootscripts/CHANGELOG	2006-03-22 01:04:34 UTC (rev 7447)
@@ -1,6 +1,10 @@
+n/a - March 21, 2006
+        * Removed old references to boot_log function and arguments passed
+          to boot_mesg_flush in echo_* functions. (DJ Lucas)
+
 n/a - March 15, 2006
 	* Wait for uevents to be processed in the udev script.  See ticket #1720
-	  for details
+	  for details. (Matthew Burgess)
 
 n/a - March 10, 2006
 	* Moved src argument to ipv4-static-route service script and 

Modified: branches/udev_update/bootscripts/lfs/init.d/functions
===================================================================
--- branches/udev_update/bootscripts/lfs/init.d/functions	2006-03-22 01:02:32 UTC (rev 7446)
+++ branches/udev_update/bootscripts/lfs/init.d/functions	2006-03-22 01:04:34 UTC (rev 7447)
@@ -124,29 +124,27 @@
 {
 	echo -n -e "${CURS_UP}${SET_COL}${BRACKET}[${SUCCESS}  OK  ${BRACKET}]"
 	echo -e "${NORMAL}"
-	boot_mesg_flush "[  OK  ]"
+        boot_mesg_flush
 }
 
 echo_failure()
 {
 	echo -n -e "${CURS_UP}${SET_COL}${BRACKET}[${FAILURE} FAIL ${BRACKET}]"
 	echo -e "${NORMAL}"
-	boot_mesg_flush "[ FAIL ]"
+        boot_mesg_flush
 }
 
 echo_warning()
 {
 	echo -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"
 	echo -e "${NORMAL}"
-	boot_mesg_flush "[ WARN ]"
+        boot_mesg_flush
 }
 
 print_error_msg()
 {
 	echo_failure
 	# $i is inherited by the rc script
-	boot_log "\n\n${i} failed and exited with a return value of ${error_value}."
-	boot_mesg_flush
 	boot_mesg -n "FAILURE:\n\nYou should not be reading this error message.\n\n" ${FAILURE}
 	boot_mesg -n " It means that an unforeseen error took"
 	boot_mesg -n " place in ${i}, which exited with a return value of"
@@ -200,9 +198,6 @@
 		return 1
 	fi
 
-#	boot_mesg_flush
-#	echo_warning
-
 	case "${1}" in
 
 		success)

Modified: branches/udev_update/bootscripts/lfs/init.d/rc
===================================================================
--- branches/udev_update/bootscripts/lfs/init.d/rc	2006-03-22 01:02:32 UTC (rev 7446)
+++ branches/udev_update/bootscripts/lfs/init.d/rc	2006-03-22 01:04:34 UTC (rev 7447)
@@ -50,7 +50,6 @@
 
 		if [ "${runlevel}" != "0" ] && [ "${runlevel}" != "6" ]; then
 			if [ ! -f ${prev_start} ] && [ ! -f ${sysinit_start} ]; then
-				boot_log "${i} cant be started in runlevel ${runlevel}, because it was not started in runlevel ${previous}"
 				boot_mesg -n "WARNING:\n\n${i} can't be" ${WARNING}
 				boot_mesg -n " executed because it was not"
 				boot_mesg -n " not started in the previous"

Modified: branches/udev_update/bootscripts/lfs/init.d/udev
===================================================================
--- branches/udev_update/bootscripts/lfs/init.d/udev	2006-03-22 01:02:32 UTC (rev 7446)
+++ branches/udev_update/bootscripts/lfs/init.d/udev	2006-03-22 01:04:34 UTC (rev 7447)
@@ -79,7 +79,6 @@
 	start)
 		boot_mesg "Populating /dev with device nodes..."
 		if ! grep -q '[[:space:]]sysfs' /proc/mounts; then
-			boot_log " The SysFS filesystem could not be found.  Unable to continue."
 			echo_failure
 			boot_mesg -n "FAILURE:\n\nUnable to create" ${FAILURE}
 			boot_mesg -n " devices without a SysFS filesystem"
@@ -97,7 +96,6 @@
 		# want /dev to be unavailable (such as by `umount -a').
 		mount -n -t tmpfs tmpfs /dev -o mode=755
 		if [ ${?} != 0 ]; then
-			boot_log "Unable to mount a tmpfs onto /dev."
 			echo_failure
 			boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}
 			boot_mesg -n " onto /dev, this system will be halted."




More information about the lfs-book mailing list