Author: sparky
Date: Fri Jul 14 22:57:49 2006
New Revision: 7525
Modified:
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash
ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live
Log:
- check for nosplash option in rc.live, not in fbsplash script itself
- accept nofbsplash too
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/fbsplash Fri Jul 14 22:57:49 2006
@@ -4,9 +4,6 @@
[ -x /sbin/splash_util ] || exit
[EMAIL PROTECTED]@ nosplash: disable fbsplash
-{ cmdopt nosplash || nvopt nosplash; } && exit
-
verbose 1 -G "Trying to start fbsplash"
/sbin/splash_util --vc=0 -m v -t ppcrcd -c setcfg >/dev/null 2>&1
Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live (original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/rc.live Fri Jul 14 22:57:49 2006
@@ -33,7 +33,12 @@
done
fi
-[ -x /usr/lib/ppcrcd/fbsplash ] && /usr/lib/ppcrcd/fbsplash
+if [ -x /usr/lib/ppcrcd/fbsplash ]; then
+ [EMAIL PROTECTED]@ nosplash: disable fbsplash
+ ! cmdopt nosplash && ! nvopt nosplash && \
+ ! cmdopt nofbsplash && ! nvopt nofbsplash && \
+ /usr/lib/ppcrcd/fbsplash
+fi
#@@ debugr / debug:
#@ put debugging information (set -x),
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
