SOURCES: fbset.init - on udev get opened terminals from /dev

[glen]

Author: glen                         Date: Thu Apr 24 00:47:34 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- on udev get opened terminals from /dev

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

---- Diffs:

================================================================
Index: SOURCES/fbset.init
diff -u SOURCES/fbset.init:1.33 SOURCES/fbset.init:1.34
--- SOURCES/fbset.init:1.33	Thu Apr 24 02:38:49 2008
+++ SOURCES/fbset.init	Thu Apr 24 02:47:28 2008
@@ -55,19 +55,22 @@
 			busy
 
 			local cons tty devpath
-			# check if devfs (workaround: -a option don't work at all)
+			# check if devfs
 			if [ -d /dev/vc ]; then
 				if [ -z "$FBTERMINALS" ]; then
 					FBTERMINALS=$(ls /dev/vc/)
 				fi
-				FBDEV=/dev/fb/${FBDEV_NUM}
-				devpath="/dev/vc/"
+				FBDEV=/dev/fb/$FBDEV_NUM
+				devpath=/dev/vc/
 			else
+				if [ -z "$FBTERMINALS" -d /dev/.udev ]; then
+					FBTERMINALS=$(ls /dev/vcsa* | awk '{print substr($0, length("/dev/vcsa") + 1)}')
+				fi
 				if [ -z "$FBTERMINALS" ]; then
 					FBTERMINALS=$(awk -F: '/^[0-9]*:/{print $1}' /etc/inittab)
 				fi
-				FBDEV=/dev/fb${FBDEV_NUM}
-				devpath="/dev/tty"
+				FBDEV=/dev/fb$FBDEV_NUM
+				devpath=/dev/tty
 			fi
 
 			# save old tty number
================================================================

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