livecd: rc.live - check for /etc/motd.en_US - check whether to ena...

[havner]

Author: havner                       Date: Wed Jul 12 07:58:20 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- check for /etc/motd.en_US
- check whether to enable bootsplash

---- Files affected:
livecd:
   rc.live (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: livecd/rc.live
diff -u livecd/rc.live:1.30 livecd/rc.live:1.31
--- livecd/rc.live:1.30	Wed Jul 12 09:29:14 2006
+++ livecd/rc.live	Wed Jul 12 09:58:15 2006
@@ -154,7 +154,7 @@
 if [ -f /etc/motd.${LANG} ]; then
 	cp -f /etc/motd.${LANG} /etc/motd
 else
-	cp -f /etc/motd.en_US /etc/motd
+	[ -f /etc/motd.en_US ] && cp -f /etc/motd.en_US /etc/motd
 fi
 
 ok
@@ -190,7 +190,7 @@
 		chkconfig --level 35 alsasound off
 	fi
 else
-	chkconfig --level 35 alsasound off > /dev/null 2>/dev/null
+	chkconfig --level 35 alsasound off > /dev/null 2>&1
 fi
 
 if [ "$CONFIG_USB" = "yes" ] && ! getparam nousb; then
@@ -432,6 +432,13 @@
 	[ -f /home/users/user/.gtkrc.mine ] && sed -i -e "s/XCHARSET/${XCHARSET}/g" /home/users/user/.gtkrc.mine
 
 	ok
+fi
+
+# check if we're running framebuffer
+if [ -f /proc/fb ] && grep -q "." /proc/fb; then
+	chkconfig --level 35 bootsplash on > /dev/null 2>&1
+else
+	chkconfig --level 35 bootsplash off > /dev/null 2>&1
 fi
 
 if getparam utc; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/rc.live?r1=1.30&r2=1.31&f=u