We need to unset keymap if it doesn't match to keep from hitting an infinite loop.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@670 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 3fd00a5c3db7b5aa81077b66e5bdd3cd9c3f21fa..30fd391c83fb1c84daee072d4a6087e7972181d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  We need to unset keymap if it doesn't match to keep from hitting an infinite
+  loop.
+
   24 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_determineargs.sh,
   gen_funcs.sh, generic/initrd.scripts, generic/linuxrc:
   Updated the keymap-handling code so it will be installed and displayed

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 04d02340e5d4e625939f48a41a8ab71e98ca7137..6e752918cdf41519c8527514dded3fae192d017c 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -589,6 +589,7 @@ chooseKeymap() {
                good_msg "Keeping default keymap"
        else
                bad_msg "Sorry, but keymap ''${keymap}'' is invalid!"
+               unset keymap
                chooseKeymap
        fi
 }