OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=5

earlykbd.init

@@ -1,37 +0,0 @@
-#! /bin/sh
-# Copyright (c) 1995-2005 SUSE LINUX Products AG, Nuernberg, Germany.
-#
-# Author:   Werner Fink <werner@suse.de>
-#
-# Please send feedback to http://www.suse.de/feedback
-#
-# /etc/init.d/earlykbd
-#
-### BEGIN INIT INFO
-# Provides:       earlykbd
-# Required-Start:
-# Required-Stop:
-# X-SuSE-Should-Start:	fbset setserial
-# X-SuSE-Should-Stop: 
-# Default-Start:  5
-# Default-Stop:
-# Description:    Keyboard settings (don't disable!)
-### END INIT INFO
-
-. /etc/rc.status
-
-function check ()
-{
-  # kbd can initialize if at least one of 
-  # defkeymap or /usr/share is available.
-
-  test -s /etc/defkeymap.map && return 0
-  test -d /usr/share/        && return 0
-  return 1;
-}
-
-rc_reset
-check || exit 0
-
-exec /etc/init.d/kbd ${1+"$@"}
-

kbd.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jun 18 14:07:53 CEST 2007 - jw@suse.de
+
+- sleep 3 removed. bugzilla #284348
+
+-------------------------------------------------------------------
+Sat Jun 16 17:07:11 CEST 2007 - coolo@suse.de
+
+- as discussed with jw and werner kbd does not need to run before
+  xdm
+
 -------------------------------------------------------------------
 Fri May 11 15:38:51 CEST 2007 - olh@suse.de
 

kbd.init

@@ -23,8 +23,8 @@
 # Provides:       kbd
 # Required-Start: $remote_fs
 # Required-Stop:
-# X-SuSE-Should-Start:	fbset setserial earlykbd
+# Should-Start:	fbset setserial
-# X-SuSE-Should-Stop: 
+# Should-Stop: 
 # Default-Start:  1 2 3 5 S
 # Default-Stop:
 # Description:    Keyboard settings (don't disable!)
@@ -85,9 +85,8 @@ fi
 # Caution: Keep in sync with earlykbd.init
 #
 if test -z "$KBD_TTY"; then
-	KBD_TTY="tty1 tty2 tty3 tty4 tty5 tty6 tty7 tty8 tty9
+        # >=tty7 left out intentionaly
-		 tty10 tty11 tty12 tty13 tty14 tty15 tty16
+	KBD_TTY="tty1 tty2 tty3 tty4 tty5 tty6"
-		 tty17 tty18 tty19 tty20 tty21 tty22 tty23 tty24"
 fi
 
 newkbd=""
@@ -117,9 +116,14 @@ case "${PREVLEVEL}${RUNLEVEL}" in
 	     echo -n $mod" "
 	     modprobe $mod >/dev/null 2>&1
 	done
-	echo 
+
-	echo "wait 3 seconds for USB initialisation ..."
+#	[bugzilla #284348]
-	sleep 3
+#	sleep is no longer needed. horay!
+#
+#	echo 
+#	echo "wait 3 seconds for USB initialisation ..."
+#	sleep 3
+
 	for mod in usbhid input hid keybdev ; do
 	     modprobe $mod >/dev/null 2>&1
 	done

kbd.spec

@@ -16,7 +16,7 @@ License:        GNU General Public License (GPL)
 Group:          System/Console
 Autoreqprov:    on
 Version:        1.12
-Release:        105
+Release:        116
 Summary:        Keyboard and Font Utilities
 Source:         ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2
 Source1:        kbd_fonts.tar.bz2
@@ -25,7 +25,6 @@ Source3:        README.SuSE
 Source4:        kbd.init
 Source5:        kbd.fillup
 Source6:        kbd.fillup.nonpc
-Source7:        earlykbd.init
 Source8:        sysconfig.console
 Source9:        sysconfig.keyboard
 Source10:       testutf8.c
@@ -157,7 +156,6 @@ if ls $K/consolefonts/Agafari-* > /dev/null 2>&1; then
   exit 1
 fi
 install -m 755 %SOURCE4 $RPM_BUILD_ROOT/etc/init.d/kbd
-install -m 755 %SOURCE7 $RPM_BUILD_ROOT/etc/init.d/earlykbd
 ln -sf ../etc/init.d/kbd $RPM_BUILD_ROOT/sbin/rckbd
 ln -sf us.map.gz $K/keymaps/i386/qwerty/khmer.map.gz
 ln -sf us.map.gz $K/keymaps/i386/qwerty/korean.map.gz
@@ -234,7 +232,6 @@ install -m 755 ./testutf8 $RPM_BUILD_ROOT/bin/
 
 %post
 %{fillup_and_insserv -npy console kbd}
-%{fillup_and_insserv -npY keyboard earlykbd}
 #echo "Please read the docu about the new COMPOSETABLE rc.config variable."
 #echo "See /etc/sysconfig/console, /etc/sysconfig/keyboard"
 #echo "and %{_docdir}/kbd/README.SuSE."
@@ -248,7 +245,6 @@ install -m 755 ./testutf8 $RPM_BUILD_ROOT/bin/
 %doc %{_defaultdocdir}/kbd
 #%doc COPYING CHANGES README CREDITS
 %config /etc/init.d/kbd
-%config /etc/init.d/earlykbd
 /var/adm/fillup-templates/sysconfig.console
 /var/adm/fillup-templates/sysconfig.keyboard
 %dir %{kbd}
@@ -321,6 +317,11 @@ rm -rf $RPM_BUILD_ROOT
 #rm -rf $RPM_BUILD_DIR/kbd-%{version}
 
 %changelog
+* Mon Jun 18 2007 - jw@suse.de
+- sleep 3 removed. bugzilla #284348
+* Sat Jun 16 2007 - coolo@suse.de
+- as discussed with jw and werner kbd does not need to run before
+  xdm
 * Fri May 11 2007 - olh@suse.de
 - do not run setfont on ps3 because it permanently blanks the screen
 * Thu Mar 29 2007 - coolo@suse.de