--- /etc/rc.sysinit.old	2007-10-13 12:54:44.263785963 +0200
+++ /etc/rc.sysinit	2007-10-13 14:12:37.782291758 +0200
@@ -322,10 +322,6 @@
 
 status "Updating Module Dependencies" /sbin/depmod -A
 
-if [ "$KEYMAP" != "" ]; then
-	status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q $KEYMAP
-fi
-
 # Flush old locale settings
 : >/etc/profile.d/locale.sh
 chmod 755 /etc/profile.d/locale.sh
@@ -335,13 +331,17 @@
 echo "export LANG=$LOCALE" >>/etc/profile.d/locale.sh
 stat_done
 
-#	If locale is *.utf set console to Unicode mode
-if [ "$(echo $LOCALE | /bin/grep -i utf)" ]; then
-	stat_busy "Setting Consoles to UTF-8"
-	/usr/bin/kbd_mode -u
-	/usr/bin/dumpkeys | /bin/loadkeys --unicode
-	# the $CONSOLE check helps us avoid this when running scripts from cron
-	echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh
+if [ "$KEYMAP" != "" ]; then
+	stat_busy "Loading Keyboard Map: $KEYMAP"
+	#	If locale is *.utf set console to Unicode mode
+	if [ "$(echo $LOCALE | /bin/grep -i utf)" ]; then
+		/usr/bin/kbd_mode -u
+		/bin/loadkeys -q --unicode $KEYMAP
+		# the $CONSOLE check helps us avoid this when running scripts from cron
+		echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then echo -ne "\e%G"; fi' >>/etc/profile.d/locale.sh
+	else
+		/bin/loadkeys -q $KEYMAP
+	fi
 	stat_done
 fi