r1604 - / trunk/bootscripts trunk/bootscripts/lfs/init.d trunk/bootscripts/lfs/sysconfig

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon May 15 16:54:04 PDT 2006


Author: jim
Date: 2006-05-15 17:54:03 -0600 (Mon, 15 May 2006)
New Revision: 1604

Added:
   trunk/bootscripts/lfs/sysconfig/lcd
Modified:
   /
   trunk/bootscripts/
   trunk/bootscripts/Changelog
   trunk/bootscripts/Makefile
   trunk/bootscripts/lfs/init.d/functions
   trunk/bootscripts/lfs/sysconfig/lcd-raq2
   trunk/bootscripts/lfs/sysconfig/lcd-raq3
Log:
 r3513 at server (orig r1641):  jim | 2006-05-15 16:14:50 -0700
  r3512 at server:  jim | 2006-05-15 16:13:26 -0700
  Updated LCD Support
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1640
   + b6734a72-470d-0410-b049-f317dca95413:/:1641


Property changes on: trunk/bootscripts
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/bootscripts:2611
3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1331
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/bootscripts:1109
   + 38c7b366-470d-0410-a457-935707c16d9b:/bootscripts:3512
3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1331
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/bootscripts:1109

Modified: trunk/bootscripts/Changelog
===================================================================
--- trunk/bootscripts/Changelog	2006-05-15 00:55:02 UTC (rev 1603)
+++ trunk/bootscripts/Changelog	2006-05-15 23:54:03 UTC (rev 1604)
@@ -1,3 +1,8 @@
+jim - May 15, 2006
+	* Hide all the output information from the LCD Program
+	* Added support for 1 line LCD screens
+	* Added a generic sysconfig/lcd
+
 jim - May 10, 2006
 	* Fixed an error when the LCD device is not available
 

Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile	2006-05-15 00:55:02 UTC (rev 1603)
+++ trunk/bootscripts/Makefile	2006-05-15 23:54:03 UTC (rev 1604)
@@ -144,5 +144,8 @@
 	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
 
+install-lcd: 
+	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 \
-	install-service-mtu minimal install-raq2 install-raq3
+	install-service-mtu minimal install-lcd install-raq2 install-raq3

Modified: trunk/bootscripts/lfs/init.d/functions
===================================================================
--- trunk/bootscripts/lfs/init.d/functions	2006-05-15 00:55:02 UTC (rev 1603)
+++ trunk/bootscripts/lfs/init.d/functions	2006-05-15 23:54:03 UTC (rev 1604)
@@ -89,7 +89,7 @@
 
 	if [ "$LCD_PROG" ]; then
 		LCD_OUT1="${1:0:$LCD_CHAR}"
-		$LCD_PROG "$LCD_OUT1"
+		$LCD_PROG "$LCD_OUT1" > /dev/null 2>&1
 	fi
 
 	while true
@@ -137,8 +137,13 @@
 	echo -e "${NORMAL}"
 	boot_mesg_flush "[  OK  ]"
 	if [ "$LCD_PROG" ]; then
-		LCD_OUT2="[  OK  ]"
-		$LCD_PROG "$LCD_OUT1" "$LCD_OUT2"
+		if [ "$LCD_LINES" = "2" ]; then
+			LCD_OUT2="[  OK  ]"
+			$LCD_PROG "$LCD_OUT1" "$LCD_OUT2" > /dev/null 2>&1
+		else
+			LCD_OUT2="${LCD_OUT1:0:12} OK"
+			$LCD_PROG "$LCD_OUT2" > /dev/null 2>&1
+		fi			
 	fi
 }
 
@@ -148,8 +153,13 @@
 	echo -e "${NORMAL}"
 	boot_mesg_flush "[ FAIL ]"
 	if [ "$LCD_PROG" ]; then
-		LCD_OUT2="[  FAIL  ]"
-		$LCD_PROG "$LCD_OUT1" "$LCD_OUT2"
+		if [ "$LCD_LINES" = "2" ]; then
+			LCD_OUT2="[ FAIL  ]"
+			$LCD_PROG "$LCD_OUT1" "$LCD_OUT2" > /dev/null 2>&1
+		else
+			LCD_OUT2="${LCD_OUT1:0:10} FAIL"
+			$LCD_PROG "$LCD_OUT2" > /dev/null 2>&1
+		fi
 	fi
 }
 
@@ -158,8 +168,13 @@
 	echo -n -e "${CURS_UP}${SET_COL}${BRACKET}[${WARNING} WARN ${BRACKET}]"
 	echo -e "${NORMAL}"
 	if [ "$LCD_PROG" ]; then
-		LCD_OUT2="[  WARN  ]"
-		$LCD_PROG "$LCD_OUT1" "$LCD_OUT2"
+		if [ "$LCD_LINES" = "2" ]; then
+			LCD_OUT2="[ WARN  ]"
+			$LCD_PROG "$LCD_OUT1" "$LCD_OUT2" > /dev/null 2>&1
+		else
+			LCD_OUT2="${LCD_OUT1:0:10} WARN"
+			$LCD_PROG "$LCD_OUT2" > /dev/null 2>&1
+		fi			
 	fi
 	boot_mesg_flush "[ WARN ]"
 }

Added: trunk/bootscripts/lfs/sysconfig/lcd
===================================================================
--- trunk/bootscripts/lfs/sysconfig/lcd	                        (rev 0)
+++ trunk/bootscripts/lfs/sysconfig/lcd	2006-05-15 23:54:03 UTC (rev 1604)
@@ -0,0 +1,29 @@
+########################################################################
+# Begin /etc/sysconfig/lcd
+#
+# Description : LCD Screen Control
+#
+# Authors     :
+#
+# Version     : 00.00
+#
+# Notes       : In the bootscripts we are assuming that the normal
+#               LCD screen can handle 2 lines 16 characters.
+#               If you LCD is one line you need to set lcd1line
+#
+########################################################################
+
+# Set the # of lines for the LCD Display
+#
+LCD_LINES=1
+
+# The executable that writes to the LCD
+#
+LCD_PROG={name of lcd program}
+
+# Number of characters the screen can handle
+# 16 is the most common
+#
+LCD_CHAR=16
+
+# End /etc/sysconfig/lcd

Modified: trunk/bootscripts/lfs/sysconfig/lcd-raq2
===================================================================
--- trunk/bootscripts/lfs/sysconfig/lcd-raq2	2006-05-15 00:55:02 UTC (rev 1603)
+++ trunk/bootscripts/lfs/sysconfig/lcd-raq2	2006-05-15 23:54:03 UTC (rev 1604)
@@ -11,6 +11,10 @@
 #
 ########################################################################
 
+# Set the # of lines for the LCD Display
+#
+LCD_LINES=2
+
 # The executable that writes to the LCD
 #
 LCD_PROG=/sbin/putlcd

Modified: trunk/bootscripts/lfs/sysconfig/lcd-raq3
===================================================================
--- trunk/bootscripts/lfs/sysconfig/lcd-raq3	2006-05-15 00:55:02 UTC (rev 1603)
+++ trunk/bootscripts/lfs/sysconfig/lcd-raq3	2006-05-15 23:54:03 UTC (rev 1604)
@@ -11,6 +11,10 @@
 #
 ########################################################################
 
+# Set the # of lines for the LCD Display
+#
+LCD_LINES=2
+
 # The executable that writes to the LCD
 #
 LCD_PROG=/sbin/lcd-write




More information about the cross-lfs mailing list