Here is an updated patch, without the bogus setup_all() function.

--- console-tools-0.2.3dbs.orig/debian/console-screen.sh
+++ console-tools-0.2.3dbs/debian/console-screen.sh
@@ -63,7 +63,7 @@
        fi
 }

-setup ()
+setup_fonts ()
 {
     # be sure the main program is installed
     [ -x "${SETFONT}" ] || return 0
@@ -136,7 +136,9 @@
        done
        [ "$VERBOSE" != "no" ] && log_action_end_msg 0
     fi
+}

+setup_keymaps() {

     # Global ACM
     [ "${APP_CHARSET_MAP}" ] && ${CHARSET} G0 ${APP_CHARSET_MAP}
@@ -169,7 +171,9 @@
     else
         unicode_stop 2> /dev/null|| true
     fi
+}

+setup_screensaver() {
     # screensaver stuff
     setterm_args=""
     if [ "$BLANK_TIME" ]; then
@@ -184,7 +188,9 @@
     if [ "$setterm_args" ]; then
         setterm $setterm_args
     fi
+}

+setup_keyboard() {
     # Keyboard rate and delay
     KBDRATE_ARGS=""
     if [ -n "$KEYBOARD_RATE" ]; then
@@ -223,8 +229,19 @@

 case "$1" in
     start|reload|restart|force-reload)
-       log_action_msg "Setting console screen modes and fonts"
-       setup
+       # Changing the fonts make usplash exit.  Avoid this.
+       if pidof usplash ; then
+           log_action_msg "Setting console screen modes"
+            setup_keymaps
+            setup_screensaver
+            setup_keyboard
+       else
+           log_action_msg "Setting console screen modes and fonts"
+            setup_fonts
+            setup_keymaps
+            setup_screensaver
+            setup_keyboard
+       fi
        ;;
     stop)
        ;;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to