fix-keymap.patch 793 B

12345678910111213141516171819202122232425262728
  1. diff --git a/install/keymap b/install/keymap
  2. index 74a9709..e61207f 100644
  3. --- a/install/keymap
  4. +++ b/install/keymap
  5. @@ -7,7 +7,7 @@ build() {
  6. l=$LANG
  7. unset LANG
  8. - for cfg in /etc/{conf.d/keymaps,locale}.conf; do
  9. + for cfg in /etc/{conf.d/keymaps,locale.conf}; do
  10. [[ -s $cfg ]] && . "$cfg"
  11. done
  12. @@ -18,7 +18,12 @@ build() {
  13. touch "$BUILDROOT/keymap.utf8"
  14. uc=-u
  15. fi
  16. - loadkeys -q $uc ${keymap:-us} -b > "$BUILDROOT/keymap.bin"
  17. +
  18. + LOADKEY_CMD="loadkeys -q $uc ${keymap:-us} -b"
  19. + if ! eval $LOADKEY_CMD > "$BUILDROOT/keymap.bin"; then
  20. + error "'${LOADKEY_CMD}' failed. No keymap is going to to be installed."
  21. + exit 1
  22. + fi
  23. ) && add_runscript
  24. }