console-setup: test 20console-setup fix on templates of keyb-conf script line.
This commit is contained in:
parent
781894728e
commit
6cedfc82ab
2 changed files with 22 additions and 1 deletions
19
helpers/DATA/console-setup/modify_20console-setup.patch
Normal file
19
helpers/DATA/console-setup/modify_20console-setup.patch
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
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
|
||||||
|
# create the required templates
|
||||||
|
debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb
|
||||||
|
|
||||||
|
@@ -27,7 +26,6 @@
|
||||||
|
do
|
||||||
|
echo keyboard-configuration $template seen true
|
||||||
|
done | chroot /target debconf-set-selections
|
||||||
|
- fi
|
||||||
|
######################################################################
|
||||||
|
|
||||||
|
apt-install keyboard-configuration || true
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
# or fetch such packages from Debian in order to build the required udeb packages.
|
# or fetch such packages from Debian in order to build the required udeb packages.
|
||||||
##
|
##
|
||||||
|
|
||||||
VERSION=5
|
VERSION=5.1
|
||||||
NETINST=true
|
NETINST=true
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
|
|
@ -34,5 +34,7 @@ sed 's/CHARMAP=ISO-8859-15/CHARMAP=UTF-8/' -i debian/console-setup.config
|
||||||
#Remove ubuntu's dependency.
|
#Remove ubuntu's dependency.
|
||||||
sed -i "s|cdebconf-newt-detect-keys, ||" debian/control
|
sed -i "s|cdebconf-newt-detect-keys, ||" debian/control
|
||||||
|
|
||||||
|
patch -p2 < $DATA/modify_20console-setup.patch
|
||||||
|
|
||||||
changelog "Rebuild upstream to get udeb dependency for debian-installer. Default to UTF-8"
|
changelog "Rebuild upstream to get udeb dependency for debian-installer. Default to UTF-8"
|
||||||
compile
|
compile
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue