From fd7e13ec8709fc1215da378fdc0a1e1f03460a90 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 25 Apr 2008 02:16:05 +0000 Subject: [PATCH] Enable keymap code when keymap is set on the kernel command line. This is genkernel 3.4.10_pre10 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@671 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 5 +++++ generic/initrd.scripts | 4 ++++ genkernel | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 30fd391..8fd60df 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, 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 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 6e75291..3589f40 100644 --- 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 61c31a0..aa9e576 100755 --- 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. -- 2.26.2