Merge remote-tracking branch 'ArrayBolt3/arraybolt3/trixie'

Author: adrelanos

debian/usability-misc.postinst

@@ -37,6 +37,25 @@ systemd_journald_audit_transport_enable() {
    touch "/var/lib/usability-misc/do_once/${FUNCNAME}_version_1"
 }
 
+generate_grub_keyboard_layouts_maybe() {
+   if [ -f "/var/lib/usability-misc/do_once/${FUNCNAME}_version_1" ]; then
+      return 0
+   fi
+
+   if ! [ -d /boot/grub/kb_layouts ]; then
+      if timeout --kill-after 5 5 localectl >/dev/null; then
+         if ischroot; then
+           true "INFO: Skipping 'set-grub-keymap --build-all' because postinst is running in chroot, ok."
+         else
+           set-grub-keymap --build-all || true
+         fi
+      fi
+   fi
+
+   mkdir -p "/var/lib/usability-misc/do_once"
+   touch "/var/lib/usability-misc/do_once/${FUNCNAME}_version_1"
+}
+
 true "
 #####################################################################
 ## INFO: BEGIN: $DPKG_MAINTSCRIPT_PACKAGE $DPKG_MAINTSCRIPT_NAME $@
@@ -61,6 +80,8 @@ case "$1" in
 
       adduser --home /run/tunnel --no-create-home --quiet --system --group --shell /bin/false "tunnel" || true
 
+      generate_grub_keyboard_layouts_maybe
+
       true "INFO: End configuring $DPKG_MAINTSCRIPT_PACKAGE."
 
       ;;

etc/grub.d/44_kb_layout

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+## Copyright (c) 2019 - 2025 ENCRYPTED SUPPORT LLC <[email protected]>
+## See the file COPYING for copying conditions.
+
+#set -x
+
+true "usability-misc $0: START"
+
+set -e
+
+if ! [ -d /boot/grub/kb_layouts ]; then
+  exit 0
+fi
+
+printf '%s\n' "\
+function load_kb_layout {
+  kb_layout_name=\"\$1\"
+
+  if [ x\$kb_layout_name = x ]; then
+    echo \"No keyboard layout specified! Press 'Enter' to continue.\"
+    read
+    return 1
+  fi
+
+  if ! [ -f \"\${prefix}/kb_layouts/\${kb_layout_name}.gkb\" ]; then
+    echo \"Keyboard layout '\$kb_layout_name' does not exist! Press 'Enter' to continue.\"
+    read
+    return 1
+  fi
+
+  echo \"Switching keyboard layouts may cause the keyboard to malfunction or\"
+  echo \"become unresponsive. If this occurs, force-reboot the machine to\"
+  echo \"fix this.\"
+  echo
+  if ! terminal_input at_keyboard; then
+    echo \"Could not enable at_keyboard driver! Press 'Enter' to continue.\"
+    read
+    return 1
+  fi
+
+  if ! keymap \"\${prefix}/kb_layouts/\${kb_layout_name}.gkb\"; then
+    echo \"Could not load keyboard layout '\$kb_layout_name'! Press 'Enter' to continue.\"
+    read
+    return 1
+  fi
+
+  echo \"Keyboard layout '\$kb_layout_name' loaded. Press 'Enter' to continue.\"
+  read
+  return 0
+}
+
+submenu 'Keyboard layout options' \$menuentry_id_option 'kb-layout-options' {"
+
+if [ -f /boot/grub/kb_layouts/user-layout.gkb ]; then
+  if [ -f /boot/grub/kb_layouts/user-layout.name ]; then
+    user_layout_name="$(cat /boot/grub/kb_layouts/user-layout.name)" || { user_layout_name='unknown'; true; }
+  else
+    user_layout_name='unknown'
+  fi
+
+  printf '%s\n' "\
+  menuentry \"SWITCH to user-defined keyboard layout '$user_layout_name'\" \$menuentry_id_option 'switch-kb-layout-user-defined' {
+    load_kb_layout 'user-layout'
+  }"
+fi
+
+for layout_file in /boot/grub/kb_layouts/*.gkb; do
+  if ! [ -f "$layout_file" ]; then
+    continue
+  fi
+  if [ "$layout_file" = '/boot/grub/kb_layouts/user-layout.gkb' ]; then
+    continue
+  fi
+  layout_name="$(basename "$layout_file" | sed 's/\..*//')"
+  printf '%s\n' "\
+  menuentry \"SWITCH to layout '$layout_name'\" \$menuentry_id_option 'switch-kb-layout-$layout_name' {
+    load_kb_layout '$layout_name'
+  }"
+done
+
+printf '%s\n' "\
+}
+"
+
+true "usability-misc $0: END"

usr/share/lintian/overrides/usability-misc

@@ -13,3 +13,7 @@ usability-misc: conflicts-with-version desktop-config-dist *
 
 usability-misc: desktop-command-not-in-package usr/bin/dist-virtual-keyboard [usr/share/applications/dist-virtual-keyboard.desktop]
 usability-misc: desktop-command-not-in-package usr/bin/dist-virtual-keyboard [usr/share/applications/dist-stop-virtual-keyboard.desktop]
+
+## These occur in strings and are part of GRUB's syntax, they aren't part of
+## the script itself.
+usability-misc: bash-term-in-posix-shell 'read' [etc/grub.d/44_kb_layout*]