Magellan Linux

Diff of /trunk/splashutils-magellan/splash

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 5 by niro, Fri Mar 4 18:09:01 2005 UTC revision 6 by niro, Fri Mar 4 18:22:17 2005 UTC
# Line 7  Line 7 
7  #  #
8  # Author: Michal Januszewski <spock@gentoo.org>  # Author: Michal Januszewski <spock@gentoo.org>
9  #  #
10  # $Header: /root/magellan-cvs/src/splashutils-magellan/splash,v 1.1 2005-03-04 18:09:01 niro Exp $  # $Header: /root/magellan-cvs/src/splashutils-magellan/splash,v 1.2 2005-03-04 18:22:17 niro Exp $
11    
12  # this is a little hack that we use to avoid a hell lot of error msgs  # this is a little hack that we use to avoid a hell lot of error msgs
13  # when sourcing splash configuration files  # when sourcing splash configuration files
14  function box() { true; }  function box() { true; }
15    function icon() { true; }
16    function rect() { true; }
17    
18  test -f /etc/conf.d/splash && . /etc/conf.d/splash  test -f /etc/conf.d/splash && . /etc/conf.d/splash
19  test -f /etc/conf.d/rc && . /etc/conf.d/rc  test -f /etc/conf.d/rc && . /etc/conf.d/rc
# Line 37  res=$(/sbin/fbres) Line 39  res=$(/sbin/fbres)
39  themefile="/etc/splash/${SPLASH_THEME}/$res.cfg"  themefile="/etc/splash/${SPLASH_THEME}/$res.cfg"
40  test -f "${themefile}" && . "${themefile}"  test -f "${themefile}" && . "${themefile}"
41    
   
42  print_text() {  print_text() {
43   text="Booting the system... Press F2 for verbose mode"   text="Booting the system... Press F2 for verbose mode"
44   [ -n "${SPLASH_BOOT_MESSAGE}" ] && text="${SPLASH_BOOT_MESSAGE}"   [ -n "${SPLASH_BOOT_MESSAGE}" ] && text="${SPLASH_BOOT_MESSAGE}"
# Line 55  print_text() { Line 56  print_text() {
56   if [ -n "$text_x" -a -n "$text_y" -a -n "$text_color" -a -n "$text_size" ]   if [ -n "$text_x" -a -n "$text_y" -a -n "$text_color" -a -n "$text_size" ]
57   then   then
58   options="-x $text_x -y $text_y -t $text_color -s $text_size"   options="-x $text_x -y $text_y -t $text_color -s $text_size"
59   if [ -n "${SPLASH_FONT}" -a -f "/etc/splash/${SPLASH_FONT}" ]   if [ -n "${SPLASH_FONT}" -a -f "/etc/splash/${SPLASH_FONT}" ]; then
  then  
60   options="$options -f \"/etc/splash/${SPLASH_FONT}\""   options="$options -f \"/etc/splash/${SPLASH_FONT}\""
61   fi   fi
62    
63     if [ -n "$text_font" -a -f "/etc/splash/${SPLASH_THEME}/$text_font" ]; then
64     options="$options -f \"/etc/splash/${SPLASH_THEME}/$text_font\""
65     fi
66    
67   eval "/sbin/fbtruetype.static $options \"$text\""   eval "/sbin/fbtruetype.static $options \"$text\""
68   fi   fi
# Line 90  if [ "$1" == "start" ]; then Line 94  if [ "$1" == "start" ]; then
94   print_text   print_text
95   fi   fi
96   fi   fi
97    
98    elif [ "$1" == "silent" ]; then
99    
100     ${SPLUTIL} -c setmode -m s
101     ${SPLUTIL} -c repaint -m s --theme=${SPLASH_THEME}
102    
103     if [ "$?" != 0 ]; then
104     ${SPLUTIL} -c setmode -m v
105     ${SPLUTIL} -c off
106     else
107     ${SPLUTIL} -c on 2>/dev/null
108     paint_progress
109     print_text
110     fi
111    
112  elif [ "$1" == "verbose" ]; then  elif [ "$1" == "verbose" ]; then
113    
114   if [ -n "`${SPLUTIL} -c getmode 2>/dev/null | grep silent 2>/dev/null`" ]; then   if [ -n "`${SPLUTIL} -c getmode 2>/dev/null | grep silent 2>/dev/null`" ]; then

Legend:
Removed from v.5  
changed lines
  Added in v.6