Skip to content

pmb.install.setup_keymap: fix fail on X11 setup

Administrator requested to merge keyboard-no-x11-fix into master

Do not fail in "pmbootstrap setup" if a keymap was selected, but no /etc/X11/xorg.conf.d path exists in the rootfs chroot. The grep output is not empty in that case (it would be empty if the directory exists and there are no matches), so we need to add this extra check:

(rootfs_nokia-n900) % grep -rl XkbLayout /etc/X11/xorg.conf.d/
grep: /etc/X11/xorg.conf.d/: No such file or directory

How to test

  • select nokia-n900 as device
  • select phosh for example as UI (doesn't really work on the device, but reproduces the bug here)
  • pmbootstrap install
Edited by Administrator

Merge request reports