diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-08-30 16:17:54 +0100 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-08-30 16:17:54 +0100 |
| commit | 4674ee4f23b0abb03250e3055b2dcbbc4e2d82eb (patch) | |
| tree | b58f632f7948d99bcf1dc1a117e8bab0495500b3 /resources/utilities | |
| parent | 3b3f7fe50c8092ddb7b09363b4d9f45c4cf38d39 (diff) | |
| download | librebootfr-4674ee4f23b0abb03250e3055b2dcbbc4e2d82eb.tar.gz librebootfr-4674ee4f23b0abb03250e3055b2dcbbc4e2d82eb.zip | |
grub-assemble gen.sh: only run list_keymaps once
Diffstat (limited to 'resources/utilities')
| -rwxr-xr-x | resources/utilities/grub-assemble/gen.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh index 7b836a62..9dc6d211 100755 --- a/resources/utilities/grub-assemble/gen.sh +++ b/resources/utilities/grub-assemble/gen.sh @@ -30,6 +30,7 @@ list_keymaps () { printf "/boot/grub/layouts/%s.gkb=keymap/%s.gkb " "${keymap}" "${keymap}" done } +keymaps=$(list_keymaps) printf "Creating GRUB ELF executable for configuration '%s'\n" "${1}" if [ "${1}" = "vesafb" ] @@ -45,7 +46,7 @@ then --install-modules="${grub_install_modules}" \ /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \ /dejavusansmono.pf2="../../../resources/grub/font/dejavusansmono.pf2" \ - $(list_keymaps) + "${keymaps}" elif [ "${1}" = "txtmode" ] then # Generate the grub.elf (txtmode) @@ -59,7 +60,7 @@ then --install-modules="${grub_install_modules}" \ /boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \ /memtest="../../../memtest86plus/memtest" \ - $(list_keymaps) + "${keymaps}" else printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}" exit 1 |