SOURCES: fbset.init - look from /sys next

glen glen at pld-linux.org
Thu Apr 24 02:51:58 CEST 2008


Author: glen                         Date: Thu Apr 24 00:51:58 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- look from /sys next

---- Files affected:
SOURCES:
   fbset.init (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SOURCES/fbset.init
diff -u SOURCES/fbset.init:1.34 SOURCES/fbset.init:1.35
--- SOURCES/fbset.init:1.34	Thu Apr 24 02:47:28 2008
+++ SOURCES/fbset.init	Thu Apr 24 02:51:52 2008
@@ -63,9 +63,12 @@
 				FBDEV=/dev/fb/$FBDEV_NUM
 				devpath=/dev/vc/
 			else
-				if [ -z "$FBTERMINALS" -d /dev/.udev ]; then
+				if [ -z "$FBTERMINALS" -a -d /dev/.udev ]; then
 					FBTERMINALS=$(ls /dev/vcsa* | awk '{print substr($0, length("/dev/vcsa") + 1)}')
 				fi
+				if [ -z "$FBTERMINALS" -a -d /sys/class/vc ]; then
+					FBTERMINALS=$(ls -d /sys/class/vc/vcsa* | awk '{print substr($0, length("/sys/class/vc/vcsa") + 1)}')
+				fi
 				if [ -z "$FBTERMINALS" ]; then
 					FBTERMINALS=$(awk -F: '/^[0-9]*:/{print $1}' /etc/inittab)
 				fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/fbset.init?r1=1.34&r2=1.35&f=u



More information about the pld-cvs-commit mailing list