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

grub-installer: test fix grub-installer efi

Browse source
This commit is contained in:
Ark74 2025-08-22 15:52:03 -06:00
parent e167196ba6
commit 73f7c02365
6 changed files with 68 additions and 3824 deletions
Download patch file Download diff file Expand all files Collapse all files

18
helpers/DATA/grub-installer/patch_changes/000-migrate_efi_fix_install_to_patch.patch Normal file
View file

@ -0,0 +1,18 @@
diff --git a/grub-installer b/grub-installer
index 4fdbb30e..af19a59f 100755
--- a/grub-installer
+++ b/grub-installer
@@ -533,8 +533,12 @@ case "$grub_package" in
grub-efi-ia32-bin grub-efi-ia32
;;
grub-efi*)
+ export DEBIAN_PRIORITY=critical
+ export DEBIAN_FRONTEND=noninteractive
+ unset DEBIAN_HAS_FRONTEND
+ unset DEBCONF_REDIR
log-output -t grub-installer $chroot $ROOT dpkg -P \
- grub grub-legacy grub-pc-bin grub-pc
+ grub grub-legacy grub-pc-bin grub-pc grub-gfxpayload-lists
;;
esac

46
helpers/DATA/grub-installer/patch_changes/001-set_only_low_priority_question_as_ubiquity.patch Normal file
View file

@ -0,0 +1,46 @@
diff --git a/grub-installer b/grub-installer
index 3d80321f..a1793ee5 100755
--- a/grub-installer
+++ b/grub-installer
@@ -475,23 +475,24 @@ case $grub_package in
NV_PRIO=high
fi
- # Should we force a copy of grub-efi to be installed
- # to the removable media path too? Set default to true
- # if the removable media path is empty, then ask at low
- # priority, or can also be pre-seeded of course
- if ! [ -e /var/lib/grub-installer/removable_media_path_checked ]; then
- info "Checking removable media path $ROOT/boot/efi/EFI/BOOT/BOOT${EFI_SUFFIX}.EFI"
- if ! [ -f $ROOT/boot/efi/EFI/BOOT/BOOT${EFI_SUFFIX}.EFI ]; then
- info "Removable media path is empty"
- db_fget grub-installer/force-efi-extra-removable seen
- if [ "$RET" = false ]; then
- info "force-efi-extra-removable not preseeded, set it true"
- db_set grub-installer/force-efi-extra-removable true
- fi
- fi
- mkdir -p /var/lib/grub-installer
- touch /var/lib/grub-installer/removable_media_path_checked
- fi
+# Mimic ubiquity 1.128ubuntu15 behaviour and only bypass low priority question. -- Ark74
+# # Should we force a copy of grub-efi to be installed
+# # to the removable media path too? Set default to true
+# # if the removable media path is empty, then ask at low
+# # priority, or can also be pre-seeded of course
+# if ! [ -e /var/lib/grub-installer/removable_media_path_checked ]; then
+# info "Checking removable media path $ROOT/boot/efi/EFI/BOOT/BOOT${EFI_SUFFIX}.EFI"
+# if ! [ -f $ROOT/boot/efi/EFI/BOOT/BOOT${EFI_SUFFIX}.EFI ]; then
+# info "Removable media path is empty"
+# db_fget grub-installer/force-efi-extra-removable seen
+# if [ "$RET" = false ]; then
+# info "force-efi-extra-removable not preseeded, set it true"
+# db_set grub-installer/force-efi-extra-removable true
+# fi
+# fi
+# mkdir -p /var/lib/grub-installer
+# touch /var/lib/grub-installer/removable_media_path_checked
+# fi
db_input $ER_PRIO grub-installer/force-efi-extra-removable || [ $? -eq 30 ]
db_go || exit 10
db_get grub-installer/force-efi-extra-removable

1098
helpers/DATA/grub-installer/patch_changes/01_39c6708ef9c5f191cf9000f7499f0a1fe2dc9422.patch
View file

File diff suppressed because it is too large Load diff

42
helpers/DATA/grub-installer/patch_changes/02_a50782a34b4e792d62b77a5b56c9ca7fe14ece9c.patch
View file

@ -1,42 +0,0 @@
From a50782a34b4e792d62b77a5b56c9ca7fe14ece9c Mon Sep 17 00:00:00 2001
From: D-I role <debian-boot@lists.debian.org>
Date: Thu, 14 Sep 2023 20:02:51 +0000
Subject: [PATCH] [l10n] Update templates.pot (from l10n-sync run at dillon)
---
debian/po/templates.pot | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 30e63b4e..c46bf4bd 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: grub-installer\n"
"Report-Msgid-Bugs-To: grub-installer@packages.debian.org\n"
-"POT-Creation-Date: 2023-04-20 20:02+0000\n"
+"POT-Creation-Date: 2023-09-14 20:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -394,14 +394,14 @@ msgstr ""
#. Description
#. :sl4:
#: ../grub-installer.templates:30001
-msgid "Failed to mount /target/proc"
+msgid "Failed to mount ${PATH}"
msgstr ""
#. Type: error
#. Description
#. :sl4:
#: ../grub-installer.templates:30001
-msgid "Mounting the proc file system on /target/proc failed."
+msgid "Mounting the ${FSTYPE} file system on ${PATH} failed."
msgstr ""
#. Type: error
--
GitLab

2659
helpers/DATA/grub-installer/patch_changes/03_1e1b1e7cd8e9284dd4067705f55c3a207e008d60.patch
View file

File diff suppressed because it is too large Load diff

29
helpers/make-grub-installer
View file

@ -18,10 +18,9 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
#VERSION=3
VERSION=0.10
VERSION=3.1
EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
REPOKEY=0E98404D386FA1D9
REPOKEY=6ED0E7B82643E131
NETINST=true
. ./config
@ -30,28 +29,8 @@ replace grub-efi-amd64-signed grub-efi-amd64
sed 's/shim-signed/shim/' -i grub-installer
cat << EOF | patch --no-backup-if-mismatch -p1
diff -ru a/grub-installer b/grub-installer
--- a/grub-installer 2022-11-25 19:04:53.765346384 -0500
+++ b/grub-installer 2022-11-25 19:16:10.042175329 -0500
@@ -508,8 +508,12 @@
grub-efi-ia32-bin grub-efi-ia32
;;
grub-efi*)
+ export DEBIAN_PRIORITY=critical
+ export DEBIAN_FRONTEND=noninteractive
+ unset DEBIAN_HAS_FRONTEND
+ unset DEBCONF_REDIR
log-output -t grub-installer \$chroot \$ROOT dpkg -P \\
- grub grub-legacy grub-pc-bin grub-pc
+ grub grub-legacy grub-pc-bin grub-pc grub-gfxpayload-lists
;;
esac
EOF
# Apply newer fixes over stable release (bookworm) using git patches.
#apply_patch_changes
# Apply patches for this release
apply_patch_changes
changelog "Remove grub-efi-amd64-signed dependency. | Non-fatal fail if mkdir efivars fails."