Commit 0008378d authored by Lorenzo Faletra's avatar Lorenzo Faletra

Import Debian changes 2.04-3parrot1

grub2 (2.04-3parrot1) rolling-testing; urgency=medium

  * Import new Debian release.
  * Add Conflicts relation between grub-efi-$arch-bin grub-efi-$arch-signed.

grub2 (2.04-3) unstable; urgency=medium

  * Apply patch from James Clarke to fix BIOS Boot Partition support on
    sparc64 (closes: #931969).
  * Fix UEFI installation for Devuan (thanks, Ivan J.; closes: #932966).
  * Add probe module to signed UEFI images (closes: #936082).
parent 4d2aa8b6
# see git-dpm(1) from git-dpm package
3d51b212987d47da2b8c65a911140bbbc2fd3153
3d51b212987d47da2b8c65a911140bbbc2fd3153
9ea692b8c6f42c4c69e1d82217d7c5aae68187d8
9ea692b8c6f42c4c69e1d82217d7c5aae68187d8
578bb115fbd47e1c464696f1f8d6183e5443975d
578bb115fbd47e1c464696f1f8d6183e5443975d
grub2_2.04.orig.tar.xz
......
......@@ -122,6 +122,7 @@ CD_MODULES="
part_gpt
password_pbkdf2
png
probe
reboot
regexp
search
......
grub2 (2.04-3parrot1) rolling-testing; urgency=medium
* Import new Debian release.
* Add Conflicts relation between grub-efi-$arch-bin grub-efi-$arch-signed.
-- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org> Wed, 06 Nov 2019 11:31:22 +0100
grub2 (2.04-3) unstable; urgency=medium
* Apply patch from James Clarke to fix BIOS Boot Partition support on
sparc64 (closes: #931969).
* Fix UEFI installation for Devuan (thanks, Ivan J.; closes: #932966).
* Add probe module to signed UEFI images (closes: #936082).
-- Colin Watson <cjwatson@debian.org> Fri, 30 Aug 2019 13:50:41 +0100
grub2 (2.04-2parrot1) rolling; urgency=medium
* Import new Debian release.
......
......@@ -38,8 +38,8 @@ Build-Depends: debhelper-compat (= 10),
Build-Conflicts: autoconf2.13, libzfs-dev, libnvpair-dev
Standards-Version: 3.9.6
Homepage: https://www.gnu.org/software/grub/
Vcs-Git: https://nest.parrotsec.org/debian-packages/grub2
Vcs-Browser: https://nest.parrotsec.org/debian-packages/grub2
Vcs-Git: https://nest.parrotsec.org/debian-packages/grub2.git
Vcs-Browser: hhttps://nest.parrotsec.org/debian-packages/grub2
Rules-Requires-Root: no
Package: grub2
......
[DEFAULT]
debian-branch = debian/master
debian-tag = debian/%(version)s
pristine-tar = True
[pq]
patch-numbers = False
[dch]
multimaint-merge = True
include:
- https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml
From 030f7c065c91bdfa93fbe666b7bc284af3bb5167 Mon Sep 17 00:00:00 2001
From 5e8e27477cd1ab3a6039ed7ad8f9ce737282876d Mon Sep 17 00:00:00 2001
From: Jeroen Dekkers <jeroen@dekkers.ch>
Date: Sat, 12 Jan 2019 21:02:18 +0100
Subject: at_keyboard: initialize keyboard in module init if keyboard is ready
......
From c4f631afd9d93fcfdf4a8a41e72c37818220b31a Mon Sep 17 00:00:00 2001
From 4415572b37c92c22301b1914d04f1459a32b1ac7 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 16 Nov 2018 16:37:02 +0000
Subject: bash-completion: Drop "have" checks
......
From ed6f9313a2965716f779f23826e9f74f3074bc8b Mon Sep 17 00:00:00 2001
From c26ef80083bf37adae620412162b118c8426f170 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:41:04 -0400
Subject: bootp: New net_bootp6 command
......
From cddbc2be5f993322a43b2660da588129c19b510a Mon Sep 17 00:00:00 2001
From f42a830d5e94bab4f1f513fac1bca108f134fd88 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:42:19 -0400
Subject: bootp: Add processing DHCPACK packet from HTTP Boot
......
From 4746efb5deb68fb95ea5b172fef043a03c0532b7 Mon Sep 17 00:00:00 2001
From d6ca3b2da81970a6194a2da62498525909145739 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 11 Mar 2019 11:17:43 +0000
Subject: Minimise writes to EFI variable storage
......@@ -872,10 +872,10 @@ index 8aeb5c4f2..a521f1663 100644
grub_install_register_efi (grub_device_t efidir_grub_dev,
const char *efifile_path,
diff --git a/util/grub-install.c b/util/grub-install.c
index 6462d3c70..d66de7f8e 100644
index ba06e1350..fdec5dd83 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -2059,7 +2059,7 @@ main (int argc, char *argv[])
@@ -2061,7 +2061,7 @@ main (int argc, char *argv[])
"\\System\\Library\\CoreServices",
efi_distributor);
if (ret)
......@@ -884,7 +884,7 @@ index 6462d3c70..d66de7f8e 100644
strerror (ret));
}
@@ -2173,7 +2173,7 @@ main (int argc, char *argv[])
@@ -2175,7 +2175,7 @@ main (int argc, char *argv[])
ret = grub_install_register_efi (efidir_grub_dev,
efifile_path, efi_distributor);
if (ret)
......
From 2a8c1fc36074fe7ac673839c5434e7e2f1498cd3 Mon Sep 17 00:00:00 2001
From 563ed9650433306740919af81fe0b4d453ed24ed Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:43:21 -0400
Subject: efinet: Setting DNS server from UEFI protocol
......
From 9ac73ba5acca6446e278cdff274ef679783d9919 Mon Sep 17 00:00:00 2001
From 14e7603b5e94ab4ff5dd9171b1508439500acce4 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:43:05 -0400
Subject: efinet: Setting network from UEFI device path
......
From 36a71e2c21b5cdfb93617dc4faff628672e9a2b7 Mon Sep 17 00:00:00 2001
From 89450c887f5dda15c19a742d7b51eaa7464dcf5a Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 27 Oct 2016 17:41:21 -0400
Subject: efinet: UEFI IPv6 PXE support
......
From 5f17e85530102bc92cb09796d878d6e399a4986d Mon Sep 17 00:00:00 2001
From ce28ebda0d4dc6e9c5945965f16a26f67ab11792 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Tue, 15 May 2018 11:36:46 +0100
Subject: Do not overwrite sentinel byte in boot_params, breaks lockdown
......
From bff220e7e6189f09678b9a25e9e92fc65b327268 Mon Sep 17 00:00:00 2001
From 5e6eccc38c0ab7dc93339b6618135119fdcc5bed Mon Sep 17 00:00:00 2001
From: Evan Broder <evan@ebroder.net>
Date: Mon, 13 Jan 2014 12:13:29 +0000
Subject: Add configure option to enable gfxpayload=keep dynamically
......
From 904799066563906ca3650c234b3b0a590b52b1ab Mon Sep 17 00:00:00 2001
From ac0feeb94e747a85ee781025239e2c0fba012f99 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Wed, 3 Dec 2014 01:25:12 +0000
Subject: Add support for forcing EFI installation to the removable media path
......@@ -22,7 +22,7 @@ Patch-Name: grub-install-extra-removable.patch
1 file changed, 108 insertions(+), 2 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
index f511cfc72..5f3217ae4 100644
index caadada98..ab79828a5 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -56,6 +56,7 @@
......@@ -183,7 +183,7 @@ index f511cfc72..5f3217ae4 100644
/* The EFI specification requires that an EFI System Partition must
contain an "EFI" subdirectory, and that OS loaders are stored in
subdirectories below EFI. Vendors are expected to pick names that do
@@ -2021,9 +2121,15 @@ main (int argc, char *argv[])
@@ -2023,9 +2123,15 @@ main (int argc, char *argv[])
fprintf (config_dst_f, "configfile $prefix/grub.cfg\n");
fclose (config_dst_f);
free (config_dst);
......
From 8e6b05dbc0a21e8d2a6e8ef2bb831f0bf8ff3a6d Mon Sep 17 00:00:00 2001
From 04aa0aa735f4bfa2d7a4f6593745fbe1d7fa0d0a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@hellion.org.uk>
Date: Sat, 6 Sep 2014 12:20:12 +0100
Subject: grub-install: Install PV Xen binaries into the upstream specified
......@@ -28,10 +28,10 @@ v2: Respect bootdir, create /boot/xen as needed.
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
index 73c623107..f511cfc72 100644
index b82c14d41..caadada98 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -2055,6 +2055,28 @@ main (int argc, char *argv[])
@@ -2057,6 +2057,28 @@ main (int argc, char *argv[])
}
break;
......@@ -60,7 +60,7 @@ index 73c623107..f511cfc72 100644
case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
@@ -2064,8 +2086,6 @@ main (int argc, char *argv[])
@@ -2066,8 +2088,6 @@ main (int argc, char *argv[])
case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
case GRUB_INSTALL_PLATFORM_I386_QEMU:
......
From 3d51b212987d47da2b8c65a911140bbbc2fd3153 Mon Sep 17 00:00:00 2001
From 445328f936b63c4ed3bfb2a713716598154ecc77 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Fri, 14 Jun 2019 16:37:11 +0100
Subject: Deal with --force-extra-removable with signed shim too
......@@ -22,7 +22,7 @@ Patch-Name: grub-install-removable-shim.patch
1 file changed, 67 insertions(+), 17 deletions(-)
diff --git a/util/grub-install.c b/util/grub-install.c
index d66de7f8e..35d150c33 100644
index fdec5dd83..666cef3d2 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -883,17 +883,13 @@ check_component_exists(const char *dir,
......@@ -57,7 +57,7 @@ index d66de7f8e..35d150c33 100644
}
int
@@ -2076,11 +2071,14 @@ main (int argc, char *argv[])
@@ -2078,11 +2073,14 @@ main (int argc, char *argv[])
case GRUB_INSTALL_PLATFORM_IA64_EFI:
{
char *dst = grub_util_path_concat (2, efidir, efi_file);
......@@ -72,7 +72,7 @@ index d66de7f8e..35d150c33 100644
char *config_dst;
FILE *config_dst_f;
@@ -2089,11 +2087,15 @@ main (int argc, char *argv[])
@@ -2091,11 +2089,15 @@ main (int argc, char *argv[])
mok_file = xasprintf ("mm%s.efi", efi_suffix);
fb_signed = xasprintf ("fb%s.efi.signed", efi_suffix);
fb_file = xasprintf ("fb%s.efi", efi_suffix);
......@@ -89,7 +89,7 @@ index d66de7f8e..35d150c33 100644
if (!removable)
{
free (efi_file);
@@ -2105,8 +2107,6 @@ main (int argc, char *argv[])
@@ -2107,8 +2109,6 @@ main (int argc, char *argv[])
chained_base = xasprintf ("grub%s.efi", efi_suffix);
chained_dst = grub_util_path_concat (2, efidir, chained_base);
grub_install_copy_file (efi_signed, chained_dst, 1);
......@@ -98,7 +98,7 @@ index d66de7f8e..35d150c33 100644
/* Not critical, so not an error if they are not present (as it
won't be for older releases); but if we have them, make
@@ -2117,8 +2117,6 @@ main (int argc, char *argv[])
@@ -2119,8 +2119,6 @@ main (int argc, char *argv[])
mok_file);
grub_install_copy_file (mok_src,
mok_dst, 0);
......@@ -107,7 +107,7 @@ index d66de7f8e..35d150c33 100644
fb_src = grub_util_path_concat (2, "/usr/lib/shim/",
fb_signed);
@@ -2126,27 +2124,79 @@ main (int argc, char *argv[])
@@ -2128,27 +2126,79 @@ main (int argc, char *argv[])
fb_file);
grub_install_copy_file (fb_src,
fb_dst, 0);
......
From e1ceeb130e1dc5b4206107fb41488eff08316820 Mon Sep 17 00:00:00 2001
From 34496889723747426b8ff5d153d02bac954273d8 Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
Date: Thu, 25 Sep 2014 18:41:29 -0300
Subject: Include a text attribute reset in the clear command for ppc
......
From 2efd14b497f45150a23c7977e5c45285d258d42c Mon Sep 17 00:00:00 2001
From 3c3e5eec12f6463838d37bf08dcbfc2586294388 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 13 Jan 2014 12:13:32 +0000
Subject: Ignore functional test failures for now as they are broken
......
From 7b5ed0cc355424e434744162d03cc43a483ac0f4 Mon Sep 17 00:00:00 2001
From ceb4be813da3c00238791b779f30b8b6ccd4775e Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@debian.org>
Date: Sun, 30 Nov 2014 12:12:52 +0000
Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen
......
From 8054cd148e7a9e3cfa546d60c06b436fb73cf803 Mon Sep 17 00:00:00 2001
From d2610b39166a4be70df916dc2b1368669c8ce315 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:27 +0000
Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR
Subject: Adjust efi_distributor for some distributions
This is not a very good approach, and certainly not sanely upstreamable;
we probably need to split GRUB_DISTRIBUTOR into a couple of different
variables.
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1242417
Bug-Debian: https://bugs.debian.org/932966
Forwarded: not-needed
Last-Update: 2013-12-25
Last-Update: 2019-08-06
Patch-Name: install-efi-ubuntu-flavours.patch
Patch-Name: install-efi-adjust-distributor.patch
---
util/grub-install.c | 2 ++
1 file changed, 2 insertions(+)
util/grub-install.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/util/grub-install.c b/util/grub-install.c
index b0c7c7c37..e5e9e439d 100644
index b0c7c7c37..e89667ff2 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1115,6 +1115,8 @@ main (int argc, char *argv[])
@@ -1115,6 +1115,10 @@ main (int argc, char *argv[])
*/
char *t;
efi_distributor = bootloader_id;
+ if (strcmp (efi_distributor, "kubuntu") == 0)
+ efi_distributor = "ubuntu";
+ else if (strcmp (efi_distributor, "devuan") == 0)
+ efi_distributor = "debian";
switch (platform)
{
case GRUB_INSTALL_PLATFORM_I386_EFI:
From 786580f06e6f715d6cb9a778926959b33134bb32 Mon Sep 17 00:00:00 2001
From 734bfb114aaab18629a91bae197e89637cbea9ee Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Tue, 28 Jan 2014 14:40:02 +0000
Subject: Port yaboot logic for various powerpc machine types
......@@ -196,10 +196,10 @@ index 2631b1074..8aeb5c4f2 100644
grub_install_register_efi (grub_device_t efidir_grub_dev,
const char *efifile_path,
diff --git a/util/grub-install.c b/util/grub-install.c
index e5e9e439d..73c623107 100644
index e89667ff2..b82c14d41 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1177,7 +1177,18 @@ main (int argc, char *argv[])
@@ -1179,7 +1179,18 @@ main (int argc, char *argv[])
if (platform == GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275)
{
......
From 025817840e1674f9159bb602dde699deec035181 Mon Sep 17 00:00:00 2001
From 64fc36ca08725830680b65dae49fcc1fedcff5a8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sat, 3 Jan 2015 12:04:59 +0000
Subject: Generate alternative init entries in advanced menu
......
From 1ff07175f797154b36c322acaf33ec7e562c7502 Mon Sep 17 00:00:00 2001
From a99af7f000456fd552fa19e5ef79a9216957ecab Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:33 +0000
Subject: Add GRUB_RECOVERY_TITLE option
......
From 9d6491949d9e80faa4ef9f699db08a68b6f0d9ba Mon Sep 17 00:00:00 2001
From 5c5619797662b981c232adbd7da7b0054f2a582c Mon Sep 17 00:00:00 2001
From: Aaron Miller <aaronmiller@fb.com>
Date: Thu, 27 Oct 2016 17:39:49 -0400
Subject: net: read bracketed ipv6 addrs and port numbers
......
From 68414261f692279b987ecccb9cb80e4e84d3c1dc Mon Sep 17 00:00:00 2001
From dd2c96823045e52c7ca9082e0a127ed2777d949a Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 24 Apr 2019 10:03:04 -0400
Subject: Forbid the "devicetree" command when Secure Boot is enabled.
......
From ed02b830bb2ecc1cce75a75f6985fd92e9332365 Mon Sep 17 00:00:00 2001
From 007de1f7e2a2816f70cf9dd3b6b3172bba9c974c Mon Sep 17 00:00:00 2001
From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
Date: Thu, 25 Sep 2014 19:33:39 -0300
Subject: Disable VSX instruction
......
From d13c402298bbee39239f4378e312c128e5fb0a88 Mon Sep 17 00:00:00 2001
From 203e54602e5121b2b2eb7c9428b8ec263bd2d777 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:31 +0000
Subject: Probe FusionIO devices
......
From 23e25d42b55a01146a4683c4bc30e821f0366101 Mon Sep 17 00:00:00 2001
From a803318ec6616e3fb9599b105d76eb5d5b8973a4 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue, 30 Oct 2018 15:04:16 -0700
Subject: If we don't have writable grubenv and we're on EFI, always show the
......
From 20154f1a5e0606fc488df60ac28a4d186cda22bd Mon Sep 17 00:00:00 2001
From e9b78b987ed3607c12f0888963fa79e48143ecd0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:28 +0000
Subject: Add configure option to bypass boot menu if possible
......
......@@ -26,7 +26,7 @@ install-signed.patch
sleep-shift.patch
wubi-no-windows.patch
maybe-quiet.patch
install-efi-ubuntu-flavours.patch
install-efi-adjust-distributor.patch
quick-boot.patch
quick-boot-lvm.patch
gfxpayload-dynamic.patch
......@@ -57,4 +57,5 @@ vsnprintf-upper-case-hex.patch
efi-variable-storage-minimise-writes.patch
no-devicetree-if-secure-boot.patch
grub-install-removable-shim.patch
sparc64-fix-bios-boot-partition-support.patch
add-failsafe-boot-options.patch
From badf90fb559ecdb1beca8a994995816b00ccbfbb Mon Sep 17 00:00:00 2001
From 8c53b03e182cb0b3e8f5f662ae277965937fc308 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 28 Oct 2018 19:45:56 +0000
Subject: Skip flaky grub_cmd_set_date test
......
From 9ea692b8c6f42c4c69e1d82217d7c5aae68187d8 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Thu, 18 Jul 2019 14:31:55 +0200
Subject: [PATCH] sparc64: Fix BIOS Boot Partition support
Currently, gpt_offset is uninitialised when using a BIOS Boot Partition
but is used unconditionally inside save_blocklists. Instead, ensure it
is always initialised to 0 (note that there is already separate code to
do the equivalent adjustment after we call save_blocklists on this code
path).
This patch has been tested on a T5-2 LDOM.
Signed-off-by: James Clarke <jrtc27@jrtc27.com>
Tested-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Eric Snowberg <eric.snowberg@oracle.com>
Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=4e75b2ae313b13b5bfb54cc5e5c53368d6eb2a08
Bug-Debian: https://bugs.debian.org/931969
Last-Update: 2019-08-06
Patch-Name: sparc64-fix-bios-boot-partition-support.patch
---
util/setup.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/setup.c b/util/setup.c
index fbdf2fcc5..512977000 100644
--- a/util/setup.c
+++ b/util/setup.c
@@ -272,6 +272,9 @@ SETUP (const char *dir,
#ifdef GRUB_SETUP_BIOS
bl.current_segment =
GRUB_BOOT_I386_PC_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
+#endif
+#ifdef GRUB_SETUP_SPARC64
+ bl.gpt_offset = 0;
#endif
bl.last_length = 0;
@@ -738,7 +741,6 @@ unable_to_embed:
#ifdef GRUB_SETUP_SPARC64
{
grub_partition_t container = root_dev->disk->partition;
- bl.gpt_offset = 0;
if (grub_strstr (container->partmap->name, "gpt"))
bl.gpt_offset = grub_partition_get_start (container);
From 3a717fc40702f20869d1b3bc49885bbaab7769dd Mon Sep 17 00:00:00 2001
From b54e0d55769116029ba0e037e7f1f089acb6259f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Werner?= <dud225@hotmail.com>
Date: Mon, 28 Jan 2019 17:24:23 +0100
Subject: Fix setup on Secure Boot systems where cryptodisk is in use
......@@ -19,10 +19,10 @@ Patch-Name: uefi-secure-boot-cryptomount.patch
1 file changed, 17 insertions(+)
diff --git a/util/grub-install.c b/util/grub-install.c
index 5f3217ae4..6462d3c70 100644
index ab79828a5..ba06e1350 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -1521,6 +1521,23 @@ main (int argc, char *argv[])
@@ -1523,6 +1523,23 @@ main (int argc, char *argv[])
|| uefi_secure_boot)
{
char *uuid = NULL;
......
From 05693dd0f57cbe73bc5c05e87425804f24a94c3c Mon Sep 17 00:00:00 2001
From 130178acce516e3f2a5cbe12772bae3db6ead3b3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 11 Mar 2019 11:15:12 +0000
Subject: Add %X to grub_vsnprintf_real and friends
......
From 251da10a71401aeafb6878918129dafaa430c877 Mon Sep 17 00:00:00 2001
From 7b87ad975a3ba432445f12a8a9731eff65a87321 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 13 Jan 2014 12:13:30 +0000
Subject: Add configure option to use vt.handoff=7
......
From fa417ef7d1ce02d15b36a435708f5dff8fdfd557 Mon Sep 17 00:00:00 2001
From 746bcc3158f9870cb5bc6046419b8a7a4d12b169 Mon Sep 17 00:00:00 2001
From: Chad MILLER <chad.miller@canonical.com>
Date: Thu, 27 Oct 2016 17:15:07 -0400
Subject: Tell zpool to emit full device names
......
......@@ -675,6 +675,7 @@ case "$1" in
cut -d' ' -f1)"
case $bootloader_id in
kubuntu) bootloader_id=ubuntu ;;
devuan) bootloader_id=debian ;;
esac
if [ "$bootloader_id" ] && [ -d "/boot/efi/EFI/$bootloader_id" ]; then
case @PACKAGE@ in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment