Enable keymap code when keymap is set on the kernel command line. This is genkernel...

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

diff --git a/ChangeLog b/ChangeLog
index 30fd391c83fb1c84daee072d4a6087e7972181d0..8fd60dffab8bf6f7253f3c883619eaf348643131 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, genkernel:
+  Enable keymap code when keymap is set on the kernel command line. This is
+  genkernel 3.4.10_pre10 for testing.
+
   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

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index 6e752918cdf41519c8527514dded3fae192d017c..3589f40c2ff4130325c8d825157c6cda7913eae8 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -430,6 +430,10 @@ cmdline_hwopts() {
                        then
                                MY_HWOPTS="`echo ${MY_HWOPTS} | sed -e \"s/${x}//g\" -`"
                        fi
+                       if [ "$(echo ${y} | cut -b -7)" = "keymap=" ]
+                       then
+                               MY_HWOPTS="${MY_HWOPTS} dokeymap"
+                       fi
                done
        done
    

diff --git a/genkernel b/genkernel
index 61c31a08f4bcb74b4e3c1249aa310916085abfe1..aa9e576c8dad589c5174eaec46eb2aa35622a2db 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.10_pre9'
+GK_V='3.4.10_pre10'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.