summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec6
-rwxr-xr-xrc.d/rc.sysinit6
2 files changed, 6 insertions, 6 deletions
diff --git a/initscripts.spec b/initscripts.spec
index 2c4166a7..aa69053e 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 7.93.28.EL
+Version: 7.93.29.EL
License: GPL
Group: System Environment/Base
Release: 1
@@ -207,6 +207,10 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Mon Feb 12 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.29.EL-1
+- Revert a backport of UTF-8 support for console keymaps
+ Related: #150769
+
* Tue Jan 30 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.28.EL-1
- Fix MACADDR on bonding slaves
Resolves: #222711
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 2de7c2e5..1ec9c2a8 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -298,11 +298,7 @@ if [ -x /bin/loadkeys ]; then
else
echo -n $"Loading default keymap: "
fi
- LOADKEYS=loadkeys
- if [ "${LANG}" != "${LANG%%.UTF-8}" -o "${LANG}" != "${LANG%%.utf8}" ]; then
- LOADKEYS="loadkeys -u"
- fi
- $LOADKEYS $KEYMAP < /dev/tty0 > /dev/tty0 2>/dev/null && \
+ loadkeys $KEYMAP < /dev/tty0 > /dev/tty0 2>/dev/null && \
success $"Loading default keymap" || failure $"Loading default keymap"
echo
fi