| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-28 21:33:51 +0000 (Thu, 28 Feb 2008) |
| 3 |
New Revision: 606 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/gen_cmdline.sh |
| 8 |
trunk/gen_initramfs.sh |
| 9 |
trunk/gen_initrd.sh |
| 10 |
trunk/generic/initrd.scripts |
| 11 |
Log: |
| 12 |
Added a --no-keymap option for bug #210886. |
| 13 |
|
| 14 |
Modified: trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- trunk/ChangeLog 2008-02-28 21:25:31 UTC (rev 605) |
| 17 |
+++ trunk/ChangeLog 2008-02-28 21:33:51 UTC (rev 606) |
| 18 |
@@ -2,6 +2,10 @@ |
| 19 |
# Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 20 |
# $Header: $ |
| 21 |
|
| 22 |
+ 28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> gen_cmdline.sh, |
| 23 |
+ gen_initramfs.sh, gen_initrd.sh, generic/initrd.scripts: |
| 24 |
+ Added a --no-keymap option for bug #210886. |
| 25 |
+ |
| 26 |
28 Feb 2008; Chris Gianelloni <wolf31o2@g.o> gen_initramfs.sh, |
| 27 |
generic/linuxrc: |
| 28 |
Use which to determine the location of splash_geninitramfs, rather than |
| 29 |
|
| 30 |
Modified: trunk/gen_cmdline.sh |
| 31 |
=================================================================== |
| 32 |
--- trunk/gen_cmdline.sh 2008-02-28 21:25:31 UTC (rev 605) |
| 33 |
+++ trunk/gen_cmdline.sh 2008-02-28 21:33:51 UTC (rev 606) |
| 34 |
@@ -74,6 +74,7 @@ |
| 35 |
echo " --splash=<theme> Enable framebuffer splash using <theme>" |
| 36 |
echo " --splash-res=<res> Select splash theme resolutions to install" |
| 37 |
echo " --do-keymap-auto Forces keymap selection at boot" |
| 38 |
+ echo " --no-keymap Disables keymap selection support" |
| 39 |
echo " --evms Include EVMS support" |
| 40 |
echo " --> 'emerge evms' in the host operating system" |
| 41 |
echo " first" |
| 42 |
@@ -199,8 +200,13 @@ |
| 43 |
;; |
| 44 |
--do-keymap-auto) |
| 45 |
CMD_DOKEYMAPAUTO=1 |
| 46 |
+ CMD_KEYMAP=1 |
| 47 |
print_info 2 "CMD_DOKEYMAPAUTO: ${CMD_DOKEYMAPAUTO}" |
| 48 |
;; |
| 49 |
+ --no-keymap) |
| 50 |
+ CMD_KEYMAP=0 |
| 51 |
+ print_info 2 "CMD_KEYMAP: ${CMD_KEYMAP}" |
| 52 |
+ ;; |
| 53 |
--evms) |
| 54 |
CMD_EVMS=1 |
| 55 |
print_info 2 "CMD_EVMS: ${CMD_EVMS}" |
| 56 |
|
| 57 |
Modified: trunk/gen_initramfs.sh |
| 58 |
=================================================================== |
| 59 |
--- trunk/gen_initramfs.sh 2008-02-28 21:25:31 UTC (rev 605) |
| 60 |
+++ trunk/gen_initramfs.sh 2008-02-28 21:33:51 UTC (rev 606) |
| 61 |
@@ -363,8 +363,11 @@ |
| 62 |
then |
| 63 |
echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults |
| 64 |
fi |
| 65 |
- mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps" |
| 66 |
- /bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz" |
| 67 |
+ if isTrue $CMD_KEYMAP |
| 68 |
+ then |
| 69 |
+ mkdir -p "${TEMP}/initramfs-aux-temp/lib/keymaps" |
| 70 |
+ /bin/tar -C "${TEMP}/initramfs-aux-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz" |
| 71 |
+ fi |
| 72 |
if isTrue $CMD_SLOWUSB |
| 73 |
then |
| 74 |
echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initramfs-aux-temp/etc/initrd.defaults |
| 75 |
|
| 76 |
Modified: trunk/gen_initrd.sh |
| 77 |
=================================================================== |
| 78 |
--- trunk/gen_initrd.sh 2008-02-28 21:25:31 UTC (rev 605) |
| 79 |
+++ trunk/gen_initrd.sh 2008-02-28 21:33:51 UTC (rev 606) |
| 80 |
@@ -290,8 +290,11 @@ |
| 81 |
then |
| 82 |
echo 'MY_HWOPTS="${MY_HWOPTS} keymap"' >> ${TEMP}/initrd-temp/etc/initrd.defaults |
| 83 |
fi |
| 84 |
- mkdir -p "${TEMP}/initrd-temp/lib/keymaps" |
| 85 |
- /bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz" |
| 86 |
+ if isTrue $CMD_KEYMAP |
| 87 |
+ then |
| 88 |
+ mkdir -p "${TEMP}/initrd-temp/lib/keymaps" |
| 89 |
+ /bin/tar -C "${TEMP}/initrd-temp/lib/keymaps" -zxf "${GK_SHARE}/generic/keymaps.tar.gz" |
| 90 |
+ fi |
| 91 |
if isTrue $CMD_SLOWUSB |
| 92 |
then |
| 93 |
echo 'MY_HWOPTS="${MY_HWOPTS} slowusb"' >> ${TEMP}/initrd-temp/etc/initrd.defaults |
| 94 |
|
| 95 |
Modified: trunk/generic/initrd.scripts |
| 96 |
=================================================================== |
| 97 |
--- trunk/generic/initrd.scripts 2008-02-28 21:25:31 UTC (rev 605) |
| 98 |
+++ trunk/generic/initrd.scripts 2008-02-28 21:33:51 UTC (rev 606) |
| 99 |
@@ -489,7 +489,7 @@ |
| 100 |
fi |
| 101 |
[ ! -e /dev/tty0 ] && ln -s /dev/tty1 /dev/tty0 |
| 102 |
|
| 103 |
- chooseKeymap |
| 104 |
+ [ -d /lib/keymaps/keymapList ] && chooseKeymap |
| 105 |
|
| 106 |
[ "${DEVBIND}" = '1' ] && umount /dev |
| 107 |
|
| 108 |
|
| 109 |
-- |
| 110 |
gentoo-commits@l.g.o mailing list |
Archives