From afc2688b2ae7b91f240cef8bab8a5ea738f25639 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 25 Apr 2008 02:09:50 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ generic/initrd.scripts | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3fd00a5..30fd391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Apr 2008; Chris Gianelloni + 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 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 04d0234..6e75291 100644 --- 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 } -- 2.26.2