From 9314e06e67bef64c880d9af207794022ca403164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org> Date: Sun, 18 Dec 2022 00:40:26 +0000 Subject: [PATCH] console-setup: 20console-setup fix on templates for keyb-conf script line. --- .../modify_20console-setup.patch | 24 ++++++++----------- helpers/make-console-setup | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/helpers/DATA/console-setup/modify_20console-setup.patch b/helpers/DATA/console-setup/modify_20console-setup.patch index 3f3ed8f17..b2334eaf3 100644 --- a/helpers/DATA/console-setup/modify_20console-setup.patch +++ b/helpers/DATA/console-setup/modify_20console-setup.patch @@ -1,19 +1,15 @@ -diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer ---- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer 2021-07-23 22:45:19.000000000 -0500 -+++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.1/debian/console-setup-udeb.base-installer 2022-12-17 13:30:51.204297663 -0600 -@@ -18,7 +18,6 @@ - cp -a /etc/default/keyboard /target/etc/default/ - LANG=C - export LANG -- if ! db_get oem-config/enable || [ "$RET" != true ]; then +diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer +--- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer 2021-07-23 22:45:19.000000000 -0500 ++++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer 2022-12-17 18:07:01.460681582 -0600 +@@ -21,9 +21,8 @@ + if ! db_get oem-config/enable || [ "$RET" != true ]; then # create the required templates debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb - -@@ -27,7 +26,6 @@ +- +- # mark the questions as seen +- for template in \## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp ++ for template in \ ++## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp do echo keyboard-configuration $template seen true done | chroot /target debconf-set-selections -- fi - ###################################################################### - - apt-install keyboard-configuration || true diff --git a/helpers/make-console-setup b/helpers/make-console-setup index 5c0d97595..60bb444aa 100644 --- a/helpers/make-console-setup +++ b/helpers/make-console-setup @@ -24,7 +24,7 @@ # or fetch such packages from Debian in order to build the required udeb packages. ## -VERSION=5.1 +VERSION=5.4 NETINST=true . ./config -- GitLab