diff options
| author |  Christian Hesse <mail@eworm.de> | 2014-06-05 20:09:41 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2014-06-05 20:09:41 +0200 |
| commit | 8c1a56877304d05b288dc8d8700cd48b72a0c868 (patch) | |
| tree | e1263747e08f9262a06281511d764e3f2f26d5aa | |
| parent | c97acc1814a00f3a72cc1bec7816b1e5b0a34668 (diff) | |
| download | mkinitcpio-chkeymap-8c1a56877304d05b288dc8d8700cd48b72a0c868.tar.gz mkinitcpio-chkeymap-8c1a56877304d05b288dc8d8700cd48b72a0c868.tar.zst | |
update to match systemd's localectl
| -rw-r--r-- | etc/00-keyboard.conf | 9 | ||||
| -rw-r--r-- | etc/05-keymap.conf | 5 | ||||
| -rw-r--r-- | etc/vconsole.conf | 4 | ||||
| -rw-r--r-- | hook/chkeymap | 6 |
4 files changed, 14 insertions, 10 deletions
diff --git a/etc/00-keyboard.conf b/etc/00-keyboard.conf new file mode 100644 index 0000000..4b00d6d --- /dev/null +++ b/etc/00-keyboard.conf @@ -0,0 +1,9 @@ +# Read and parsed by systemd-localed. It's probably wise not to edit this file +# manually too freely. +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "en" + Option "XkbModel" "pc105" + Option "XkbOptions" "terminate:ctrl_alt_bksp" +EndSection diff --git a/etc/05-keymap.conf b/etc/05-keymap.conf deleted file mode 100644 index 18b17b1..0000000 --- a/etc/05-keymap.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "InputClass" - Identifier "Keyboard Defaults" - MatchIsKeyboard "true" - Option "XkbLayout" "en" -EndSection diff --git a/etc/vconsole.conf b/etc/vconsole.conf index 9c179b7..ac40ccb 100644 --- a/etc/vconsole.conf +++ b/etc/vconsole.conf @@ -1,2 +1,2 @@ -KEYMAP="en" -FONT="ter-116b" +FONT=ter-116b +KEYMAP=en diff --git a/hook/chkeymap b/hook/chkeymap index 0f0f5a9..0fde5ac 100644 --- a/hook/chkeymap +++ b/hook/chkeymap @@ -2,15 +2,15 @@ run_latehook() { local newroot="/new_root/" - + if [[ "${keymap}" = "interactive" ]]; then echo echo -n "Please give keymap to use: " read keymap fi msg ":: Setting keymap for main system to '${keymap}'..." - sed -i "/^KEYMAP=/c KEYMAP=\"${keymap}\"" "${newroot}/etc/vconsole.conf" - sed -i "/XkbLayout/c Option \"XkbLayout\" \"${keymap}\"" "${newroot}/etc/X11/xorg.conf.d/05-keymap.conf" + sed -i "/^KEYMAP=/c KEYMAP=${keymap}" "${newroot}/etc/vconsole.conf" + sed -i "/XkbLayout/c Option \"XkbLayout\" \"${keymap}\"" "${newroot}/etc/X11/xorg.conf.d/00-keyboard.conf" if [[ "${timezone}" = "interactive" ]]; then echo |