CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

finish-install: move base release to trixie for d-i/udeb build.

Browse source
This commit is contained in:
Ark74 2025-04-18 02:16:07 -06:00
parent 9aa0a91c07
commit 9e60d31d3c
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
helpers/DATA/finish-install/fix_keyboard-configure-netinstall.patch
View file

@ -1,16 +0,0 @@
diff -Nru finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs
--- finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs 2018-08-10 14:21:58.000000000 -0500
+++ finish-install-2.104+11.0trisquel0/finish-install.d/10update-initramfs 2022-12-18 17:56:21.817264252 -0600
@@ -4,7 +4,11 @@
# update-initramfs to make sure one can type the passphrase
# (see #694156, workaround for #696773):
/bin/in-target \
- /bin/sh -c "dpkg-query -s cryptsetup >/dev/null 2>&1 && dpkg-query -s console-setup >/dev/null 2>&1"
+ /bin/sh -c "dpkg-query -s console-setup >/dev/null 2>&1"
+
+#Fix bug keyboard not using the selected layout.
+/bin/in-target \
+ dpkg-reconfigure -f noninteractive keyboard-configuration
if [ $? = 0 ]; then
echo "Encrypted LVM detected, refreshing initramfs"

16
helpers/DATA/finish-install/patch_changes/001-fix_keyboard-configure-netinstall.patch Normal file
View file

@ -0,0 +1,16 @@
diff --git a/finish-install.d/10update-initramfs b/finish-install.d/10update-initramfs
index f91557cb..6b35ce25 100755
--- a/finish-install.d/10update-initramfs
+++ b/finish-install.d/10update-initramfs
@@ -6,8 +6,10 @@ log() {
# If both cryptsetup and console-setup are installed, run update-initramfs to
# make sure one can type the passphrase (see #694156, workaround for #696773):
-if /bin/in-target /bin/sh -c "dpkg-query -s cryptsetup >/dev/null 2>&1 && dpkg-query -s console-setup >/dev/null 2>&1"; then
+if /bin/in-target /bin/sh -c "dpkg-query -s console-setup >/dev/null 2>&1"; then
log "refresh initramfs for cryptsetup"
+ # Fix bug keyboard not using the selected layout. --Trisquel
+ /bin/in-target /bin/sh -c "dpkg-reconfigure -f noninteractive keyboard-configuration"
refresh=yes
fi

4
helpers/make-finish-install
View file

@ -24,12 +24,12 @@
##
VERSION=1
EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
REPOKEY=0E98404D386FA1D9
NETINST=true
. ./config
patch --no-backup-if-mismatch -p1 < $DATA/fix_keyboard-configure-netinstall.patch
apply_patch_changes
changelog "Fetch and build as udeb dependency for debian-installer."
package