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 30f223390cb43d4bae8338947fc6be2be808804f..4ef9a8bbc2fe04c1af2f880ed649dc07c829b128 100644 (file)
--- 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 dd444296ab794b4e483b935a636f0c81d30d4c5c..10fdb137f4458dc11c4cd6950f904f83608f2c5d 100755 (executable)
--- 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