diff options
| -rw-r--r-- | docs/maintain/index.html | 9 | ||||
| -rwxr-xr-x | resources/utilities/grub-assemble/gen.sh | 12 | ||||
| -rwxr-xr-x | resources/utilities/grub-assemble/grub_memdisk_keymap | 29 |
3 files changed, 11 insertions, 39 deletions
diff --git a/docs/maintain/index.html b/docs/maintain/index.html index 8c716422..d220f963 100644 --- a/docs/maintain/index.html +++ b/docs/maintain/index.html @@ -458,14 +458,7 @@ and contains MemTest86+. You probably don't need to modify these files at all. </p> - - <p> - <i>grub_memdisk_keymap</i> simply adds all the keyboard layout - files. The keymap files are in <i>keymap/</i>, and - can be added to using the instructions at - <a href="../grub/index.html#grub_custom_keyboard">../grub/index.html#grub_custom_keyboard</a>. - </p> - + <p> <i>modules.conf</i> defines which modules will be included in the GRUB ELF executable. diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh index e044efdf..7b836a62 100755 --- a/resources/utilities/grub-assemble/gen.sh +++ b/resources/utilities/grub-assemble/gen.sh @@ -23,6 +23,14 @@ grubdir="../../../grub" source "modules.conf" +list_keymaps () { + for keylayout in keymap/original/* + do + keymap="${keylayout##*/}" + printf "/boot/grub/layouts/%s.gkb=keymap/%s.gkb " "${keymap}" "${keymap}" + done +} + printf "Creating GRUB ELF executable for configuration '%s'\n" "${1}" if [ "${1}" = "vesafb" ] then @@ -37,7 +45,7 @@ then --install-modules="${grub_install_modules}" \ /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \ /dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \ - $(./grub_memdisk_keymap) + $(list_keymaps) elif [ "${1}" = "txtmode" ] then # Generate the grub.elf (txtmode) @@ -51,7 +59,7 @@ then --install-modules="${grub_install_modules}" \ /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \ /memtest="../../../memtest86plus/memtest" \ - $(./grub_memdisk_keymap) + $(list_keymaps) else printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}" exit 1 diff --git a/resources/utilities/grub-assemble/grub_memdisk_keymap b/resources/utilities/grub-assemble/grub_memdisk_keymap deleted file mode 100755 index 451a69f3..00000000 --- a/resources/utilities/grub-assemble/grub_memdisk_keymap +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# -# lists keymaps -# -# Copyright (C) 2014, 2015 Francis Rowe <info@gluglug.org.uk> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -[ "x${DEBUG+set}" = 'xset' ] && set -v -set -u -e - -for keylayout in keymap/original/* -do - keymap="${keylayout##*/}" - printf "/boot/grub/layouts/%s.gkb=keymap/%s.gkb " "${keymap}" "${keymap}" -done |