Fix LUKS passphrase prompt for non-US keyboard layouts, undo an accidental change to Kubuntu

common/fixconkeys-part1

@@ -0,0 +1,3 @@
+#!/bin/bash
+setxkbmap -query | awk '/layout/{ print $2 }' > /dev/shm/fixconkeys-layout
+cp /usr/libexec/fixconkeys-part2 ${1}/usr/libexec/fixconkeys-part2

common/fixconkeys-part2

@@ -0,0 +1,5 @@
+#!/bin/bash
+loadkeys "$(cat /dev/shm/fixconkeys-layout)"
+setupcon --save-only
+update-initramfs -c -k all
+rm /usr/libexec/fixconkeys-part2

common/modules/shellprocess_fixconkeys_part1.conf

@@ -0,0 +1,5 @@
+---
+dontChroot: true
+timeout: 30
+script:
+    - /usr/libexec/fixconkeys-part1 ${ROOT}

common/modules/shellprocess_fixconkeys_part2.conf

@@ -0,0 +1,5 @@
+---
+dontChroot: false
+timeout: 30
+script:
+    - /usr/libexec/fixconkeys-part2

debian/changelog

@@ -1,3 +1,11 @@
+calamares-settings-ubuntu (1:24.04.20) noble; urgency=medium
+
+  * Fix LUKS passphrase unlocker for non-US keyboard layouts.
+  * Disable pkgselect module on Kubuntu, it's not ready for use and wasn't
+    intentionally enabled.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 21 Mar 2024 13:32:53 -0500
+
 calamares-settings-ubuntu (1:24.04.19) noble; urgency=medium
 
   * Add Ubuntu Unity configuration. (LP: #2055799)

debian/rules

@@ -33,3 +33,6 @@ override_dh_missing:
 	chmod 644 $(MODULES_DIR)/pkgselect/module.desc
 	mkdir -pv debian/calamares-settings-ubuntu-common/usr/bin/
 	cp -v common/snap_install debian/calamares-settings-ubuntu-common/usr/bin/calamares_snap_install
+	mkdir -pv debian/calamares-settings-ubuntu-common/usr/libexec/
+	cp -v common/fixconkeys-part1 debian/calamares-settings-ubuntu-common/usr/libexec/fixconkeys-part1
+	cp -v common/fixconkeys-part2 debian/calamares-settings-ubuntu-common/usr/libexec/fixconkeys-part2

kubuntu/settings.conf

@@ -20,22 +20,21 @@ instances:
 - id: add386arch
   module: shellprocess
   config: shellprocess_add386arch.conf
-- id: pkgselect_action
-  module: contextualprocess
-  config: pkgselect_context.conf
-- id: pkgselect_snap_action
-  module: contextualprocess
-  config: pkgselect_snap_context.conf
 - id: oemprep
   module: shellprocess
   config: shellprocess_oemprep.conf
+- id: fixconkeys_part1
+  module: shellprocess
+  config: shellprocess_fixconkeys_part1.conf
+- id: fixconkeys_part2
+  module: shellprocess
+  config: shellprocess_fixconkeys_part2.conf
 
 sequence:
 - show:
   - welcome
   - locale
   - keyboard
-  - pkgselect
   - partition
   - users
   - summary
@@ -63,9 +62,9 @@ sequence:
   - contextualprocess@after_bootloader
   - automirror
   - shellprocess@add386arch
+  - shellprocess@fixconkeys_part1
+  - shellprocess@fixconkeys_part2
   - packages
-  - contextualprocess@pkgselect_action
-  - contextualprocess@pkgselect_snap_action
   - shellprocess@logs
   - umount
 - show:

lubuntu/settings.conf

@@ -29,6 +29,12 @@ instances:
 - id: oemprep
   module: shellprocess
   config: shellprocess_oemprep.conf
+- id: fixconkeys_part1
+  module: shellprocess
+  config: shellprocess_fixconkeys_part1.conf
+- id: fixconkeys_part2
+  module: shellprocess
+  config: shellprocess_fixconkeys_part2.conf
 
 sequence:
 - show:
@@ -63,6 +69,8 @@ sequence:
   - contextualprocess@after_bootloader
   - automirror
   - shellprocess@add386arch
+  - shellprocess@fixconkeys_part1
+  - shellprocess@fixconkeys_part2
   - packages
   - contextualprocess@pkgselect_action
   - contextualprocess@pkgselect_snap_action

ubuntuunity/settings.conf

@@ -23,6 +23,12 @@ instances:
 - id: oemprep
   module: shellprocess
   config: shellprocess_oemprep.conf
+- id: fixconkeys_part1
+  module: shellprocess
+  config: shellprocess_fixconkeys_part1.conf
+- id: fixconkeys_part2
+  module: shellprocess
+  config: shellprocess_fixconkeys_part2.conf
 
 sequence:
 - show:
@@ -56,6 +62,8 @@ sequence:
   - contextualprocess@after_bootloader
   - automirror
   - shellprocess@add386arch
+  - shellprocess@fixconkeys_part1
+  - shellprocess@fixconkeys_part2
   - packages
   - shellprocess@logs
   - umount