diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-08-30 11:14:42 (EDT) |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-08-30 11:14:42 (EDT) |
| commit | 3b3f7fe50c8092ddb7b09363b4d9f45c4cf38d39 (patch) | |
| tree | fd0a8b9539c70024ee9fbee51e02eda622cafa1e /resources/utilities/grub-assemble | |
| parent | 4c15117d2b2a7b8e9dc2967992fe9b742602ee27 (diff) | |
| download | libreboot-3b3f7fe50c8092ddb7b09363b4d9f45c4cf38d39.zip libreboot-3b3f7fe50c8092ddb7b09363b4d9f45c4cf38d39.tar.gz libreboot-3b3f7fe50c8092ddb7b09363b4d9f45c4cf38d39.tar.bz2 | |
grub-assemble: generate keymap list using function, not script
Diffstat (limited to 'resources/utilities/grub-assemble')
| -rwxr-xr-x | resources/utilities/grub-assemble/gen.sh | 12 | ||||
| -rwxr-xr-x | resources/utilities/grub-assemble/grub_memdisk_keymap | 29 |
2 files changed, 10 insertions, 31 deletions
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh index e044efd..7b836a6 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 451a69f..0000000 --- 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 |