diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 16:29:52 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 16:29:52 +0000 |
commit | ca67b09c015d4af3ae3cce12aa72e60941dbb8b5 (patch) | |
tree | b7316d7b06c373e08dabb79a2c866c568e08f49e /debian/patches/install-stage2-confusion.patch | |
parent | Adding upstream version 2.06. (diff) | |
download | grub2-ca67b09c015d4af3ae3cce12aa72e60941dbb8b5.tar.xz grub2-ca67b09c015d4af3ae3cce12aa72e60941dbb8b5.zip |
Adding debian version 2.06-13+deb12u1.debian/2.06-13+deb12u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/install-stage2-confusion.patch')
-rw-r--r-- | debian/patches/install-stage2-confusion.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/debian/patches/install-stage2-confusion.patch b/debian/patches/install-stage2-confusion.patch new file mode 100644 index 0000000..d7e60d3 --- /dev/null +++ b/debian/patches/install-stage2-confusion.patch @@ -0,0 +1,46 @@ +From 07ebcd8f769c2522b9a3a79c3d92082747f83781 Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@debian.org> +Date: Mon, 13 Jan 2014 12:12:58 +0000 +Subject: If GRUB Legacy is still around, tell packaging to ignore it + +Bug-Debian: http://bugs.debian.org/586143 +Forwarded: not-needed +Last-Update: 2021-09-24 + +Patch-Name: install-stage2-confusion.patch +--- + util/grub-install.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/util/grub-install.c b/util/grub-install.c +index 0fbe7f78c..48e2d3779 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -42,6 +42,7 @@ + #include <grub/emu/config.h> + #include <grub/util/ofpath.h> + #include <grub/hfsplus.h> ++#include <grub/emu/hostfile.h> + + #include <string.h> + +@@ -1727,6 +1728,19 @@ main (int argc, char *argv[]) + + grub_set_install_backup_ponr (); + } ++ ++ /* If vestiges of GRUB Legacy still exist, tell the Debian packaging ++ that they can ignore them. */ ++ if (!rootdir && grub_util_is_regular ("/boot/grub/stage2") && ++ grub_util_is_regular ("/boot/grub/menu.lst")) ++ { ++ grub_util_fd_t fd; ++ ++ fd = grub_util_fd_open ("/boot/grub/grub2-installed", ++ GRUB_UTIL_FD_O_WRONLY); ++ grub_util_fd_close (fd); ++ } ++ + break; + } + case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275: |