From: Peter Hjalmarsson <xake@rymdraket.net>
Date: Mon, 7 Mar 2011 08:45:41 +0000 (+0100)
Subject: Fix typo
X-Git-Tag: v3.4.14~1^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a768d85c5ac5c19b02e79a55e5c90e6e157ee0b9;p=genkernel.git
Fix typo
By adding the kernelcmd options "dokeymap" to MY_HWOPTS instead of
the HWOPTS version, "keymap" this typo broke the handling of keymaps
if you only had "keymap=<...>" in kernelcmd and did not specify "dokeymap"
too (which according to documentation should not be needed).
---
diff --git a/ChangeLog b/ChangeLog
index 30f2233..4ef9a8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
# Distributed under the GPL v2
# $Id$
+ 07 Mar 2011; Peter Hjalmarsson <xake@gentoo.org> defaults/initrd.scripts:
+ Fix typo where the kernelcmd version "dokeymap" was added to MY_HWOPTS
+ instead of the HWOPTS version "keymap".
+ Broke setups where only "keymap=<...>" was added to kernelcmd.
+
24 Feb 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
Fix handling of mdadm.conf (bug #354809)
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index dd44429..10fdb13 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -466,7 +466,7 @@ cmdline_hwopts() {
fi
if [ "$(echo ${y} | cut -b -7)" = "keymap=" ]
then
- MY_HWOPTS="${MY_HWOPTS} dokeymap"
+ MY_HWOPTS="${MY_HWOPTS} keymap"
fi
done
done