12345678910111213141516171819202122232425262728 |
- diff --git a/install/keymap b/install/keymap
- index 74a9709..e61207f 100644
- --- a/install/keymap
- +++ b/install/keymap
- @@ -7,7 +7,7 @@ build() {
- l=$LANG
- unset LANG
-
- - for cfg in /etc/{conf.d/keymaps,locale}.conf; do
- + for cfg in /etc/{conf.d/keymaps,locale.conf}; do
- [[ -s $cfg ]] && . "$cfg"
- done
-
- @@ -18,7 +18,12 @@ build() {
- touch "$BUILDROOT/keymap.utf8"
- uc=-u
- fi
- - loadkeys -q $uc ${keymap:-us} -b > "$BUILDROOT/keymap.bin"
- +
- + LOADKEY_CMD="loadkeys -q $uc ${keymap:-us} -b"
- + if ! eval $LOADKEY_CMD > "$BUILDROOT/keymap.bin"; then
- + error "'${LOADKEY_CMD}' failed. No keymap is going to to be installed."
- + exit 1
- + fi
- ) && add_runscript
- }
-
|