Added a --no-keymap option for bug #210886.

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

diff --git a/ChangeLog b/ChangeLog
index 2a6bb80ac8615c472188ce5688df1868b036d7cc..843ec20fe12927945bcd3a9c63d72f1b43203082 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_cmdline.sh,
+  gen_initramfs.sh, gen_initrd.sh, generic/initrd.scripts:
+  Added a --no-keymap option for bug #210886.
+
   28 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
   generic/linuxrc:
   Use which to determine the location of splash_geninitramfs, rather than

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 7a962cbf322a533733c5d08b71c65111e827d6ae..44089004741abd0e048e858229524f4a76da3cb7 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -74,6 +74,7 @@ longusage() {
   echo "       --splash=<theme>        Enable framebuffer splash using <theme>"
   echo "       --splash-res=<res>      Select splash theme resolutions to install"
   echo "       --do-keymap-auto        Forces keymap selection at boot"
+  echo "       --no-keymap             Disables keymap selection support"
   echo "       --evms                  Include EVMS support"
   echo "                               --> 'emerge evms' in the host operating system"
   echo "                               first"
@@ -199,8 +200,13 @@ parse_cmdline() {
                        ;;
                --do-keymap-auto)
                        CMD_DOKEYMAPAUTO=1
+                       CMD_KEYMAP=1
                        print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}"
                        ;;
+               --no-keymap)
+                       CMD_KEYMAP=0
+                       print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}"
+                       ;;
                --evms)
                        CMD_EVMS=1
                        print_info 2 "CMD_EVMS: ${CMD_EVMS}"

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 72809824ed647d802b0c670739d3241acdc5ea6e..659398dc9d7a10002f8af438dde235f56e6f3685 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -363,8 +363,11 @@ append_auxilary() {
        then
                echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults
        fi
-       mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
-       /bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+       if isTrue $CMD_KEYMAP
+       then
+               mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps"
+               /bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+       fi
        if isTrue $CMD_SLOWUSB
        then
                echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 8fc64efe30571038fc92c364dd4bb19a198f2345..a633f98ce8caa573ed5b36460d5460063fda55c1 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -290,8 +290,11 @@ create_initrd_aux() {
        then
                echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initrd-temp/etc/initrd.defaults
        fi
-       mkdir -p "${TEMP}/initrd-temp/lib/keymaps"
-       /bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+       if isTrue $CMD_KEYMAP
+       then
+               mkdir -p "${TEMP}/initrd-temp/lib/keymaps"
+               /bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz"
+       fi
        if isTrue $CMD_SLOWUSB
        then
                echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initrd-temp/etc/initrd.defaults

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