[Lunar-commits] r23484 - in moonbase/trunk/utils/sysvinit: . init.d

[Moritz Heiber]

Author: moe
Date: 2007-03-04 13:06:51 +0100 (Sun, 04 Mar 2007)
New Revision: 23484

Modified:
   moonbase/trunk/utils/sysvinit/DETAILS
   moonbase/trunk/utils/sysvinit/init.d/bootmisc
Log:
This fixes the recent issue with migrating from
console-tools to kbd. And loadkeys doesn't throw any more 
messages on boot.



Modified: moonbase/trunk/utils/sysvinit/DETAILS
===================================================================
--- moonbase/trunk/utils/sysvinit/DETAILS	2007-03-04 11:40:08 UTC (rev 23483)
+++ moonbase/trunk/utils/sysvinit/DETAILS	2007-03-04 12:06:51 UTC (rev 23484)
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:3e78df609a2ff0fea6304cb662a7f10298d03667
         WEB_SITE=ftp://ftp.cistron.nl/pub/people/miquels/sysvinit
          ENTERED=20010922
-         UPDATED=20041211
+         UPDATED=20070304
            SHORT="parent process of all process."
 cat << EOF
 sysvinit

Modified: moonbase/trunk/utils/sysvinit/init.d/bootmisc
===================================================================
--- moonbase/trunk/utils/sysvinit/init.d/bootmisc	2007-03-04 11:40:08 UTC (rev 23483)
+++ moonbase/trunk/utils/sysvinit/init.d/bootmisc	2007-03-04 12:06:51 UTC (rev 23484)
@@ -3,14 +3,19 @@
 # bootmisc - system startup script
 #
 
+if [ -x /usr/bin/setfont ]; then
+  CONSOLETOOL="/usr/bin/setfont";
+else
+  CONSOLETOOL="/usr/bin/consolechars -f";
+fi
+
 case $1 in
   start)
     dmesg > /var/log/dmesg
 	dmesg -n4
     touch /var/run/utmp /var/run/wtmp
     [ ! -f /etc/LOCALE ] || . /etc/LOCALE
-    [ ! -f /etc/keymap ] || loadkeys $(cat /etc/keymap)
-    [ ! -f /etc/consolefont ] || consolechars -f $(cat /etc/consolefont)
+    [ ! -f /etc/keymap ] || loadkeys -q $(cat /etc/keymap)
+    [ ! -f /etc/consolefont ] || $CONSOLETOOL $(cat /etc/consolefont)
     ;;
 esac
-