Fixes to GRUB keyboard options menu, generate GRUB keyboard layouts on upgrade/installation if possible

Author: ArrayBolt3

debian/usability-misc.postinst

@@ -37,6 +37,21 @@ 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
+         set-grub-keymap --build-all || true
+      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 +76,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

@@ -13,8 +13,6 @@ if ! [ -d /boot/grub/kb_layouts ]; then
   exit 0
 fi
 
-user_layout_name="$(cat /boot/grub/kb_layouts/user-layout.name)" || { user_layout_name='unknown'; true; }
-
 printf '%s\n' "\
 function load_kb_layout {
   kb_layout_name=\"\$1\"
@@ -52,10 +50,20 @@ function load_kb_layout {
   return 0
 }
 
-submenu 'Keyboard layout options' \$menuentry_id_option 'kb-layout-options' {
+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