Move setup_keymap call to before LUKS setup

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

diff --git a/ChangeLog b/ChangeLog
index 458243c3506edc180d73858f987912c9fd13d39c..3aa1b220ecb4819d953fdceb7fb901d4887954db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 May 2008; Andrew Gaffney <agaffney@gentoo.org> generic/linuxrc:
+  Move setup_keymap call to before LUKS setup
+
   10 May 2008; Andrew Gaffney <agaffney@gentoo.org> gen_compile.sh:
   Store pre-oldconfig busybox .config for use in bincache comparison
 

diff --git a/generic/linuxrc b/generic/linuxrc
index 03745f46e9d1d263c2ba00767ff4906e83518654..780b70752add56331cbdc5a6fa652045fe5a9ddf 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -235,6 +235,8 @@ setup_md_device
 # Scan volumes
 startVolumes
 
+setup_keymap
+
 # Initialize LUKS root device except for livecd's
 if [ "${CDROOT}" != 1 ]
 then
@@ -316,8 +318,6 @@ then
        fi
 fi
 
-setup_keymap
-
 # Determine root device
 good_msg 'Determining root device...'
 while true