Change from using a directory check to a file check. This should fix bug #215822.

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

diff --git a/ChangeLog b/ChangeLog
index fc7d7050a762ce4f59424cfea6a0bb86cbf8471f..ea94771ee874a51f97128ac7cb64e3c2c82821d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  generic/initrd.scripts:
+  Change from using a directory check to a file check. This should fix bug
+  #215822.
+
   12 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.defaults:
   Move removable storage like USB and firewire after traditional fixed storage

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 9bad20e6723ed5ab47a232ff2ff9c227f8ab4dfc..0e92ea9b9b7c35e905d8674db2d2b777b3d44f1b 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -507,7 +507,7 @@ setup_keymap() {
                fi
                [ ! -e /dev/tty0 ] && ln -s /dev/tty1 /dev/tty0
 
-               [ -d /lib/keymaps/keymapList ] && chooseKeymap
+               [ -f /lib/keymaps/keymapList ] && chooseKeymap
 
                [ "${DEVBIND}" = '1' ] && umount /dev