diff options
| author | nl6720 <nl6720@gmail.com> | 2023-08-11 13:33:41 +0300 |
|---|---|---|
| committer | nl6720 <nl6720@gmail.com> | 2023-08-11 13:33:41 +0300 |
| commit | b62ddd5cca7646e9ccb5f7a0069b95e954bcc51e (patch) | |
| tree | 5cfd5bf55d8f7b1956665fadda350c11b5136cd4 | |
| parent | 3c6ec03faea32742161e0be693e4f9496ad417de (diff) | |
install/{keymap,sd-vconsole}: replace "kernel" with "@kernel"
systemd changed the magic string to keep the kernel's default keymap
from "kernel" to "@kernel" to avoid namespace issues.
See https://github.com/systemd/systemd/commit/bf77d59772722e96508df91bd24e1b6940b3edfb
Fixes: b0c109f1f3f936eeba395a7c9598a7d280df0323 ("/install/{keymap,sd-vconsole}: do not fail on KEYMAP=kernel")
| -rw-r--r-- | install/keymap | 2 | ||||
| -rw-r--r-- | install/sd-vconsole | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install/keymap b/install/keymap index 3b9100f..d30ec81 100644 --- a/install/keymap +++ b/install/keymap @@ -24,7 +24,7 @@ build() { touch "$BUILDROOT/keymap.utf8" loadkeys_opts+=('-u') fi - if [[ "$KEYMAP" != 'kernel' ]]; then + if [[ "$KEYMAP" != '@kernel' ]]; then loadkeys "${loadkeys_opts[@]}" "${KEYMAP:-us}" -b >"$BUILDROOT/keymap.bin" fi ) && add_runscript diff --git a/install/sd-vconsole b/install/sd-vconsole index b8fba21..9f2e657 100644 --- a/install/sd-vconsole +++ b/install/sd-vconsole @@ -70,7 +70,7 @@ build() { # shellcheck disable=SC1091 [[ -s /etc/vconsole.conf ]] && . /etc/vconsole.conf - [[ "$KEYMAP" != 'kernel' ]] && add_keymap_file "${KEYMAP:-us}.map" + [[ "$KEYMAP" != '@kernel' ]] && add_keymap_file "${KEYMAP:-us}.map" [[ -n "$KEYMAP_TOGGLE" ]] && add_keymap_file "${KEYMAP_TOGGLE}.map" if [[ -n "$FONT_MAP" ]]; then |