mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
35 lines
956 B
Diff
35 lines
956 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 21 Jun 2018 18:32:26 -0400
|
|
Subject: [PATCH] Put back our code to add a local route.
|
|
|
|
This was removed by the previous patch.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/net/bootp.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
|
index ff1d7776e7f..242cd1f4cbd 100644
|
|
--- a/grub-core/net/bootp.c
|
|
+++ b/grub-core/net/bootp.c
|
|
@@ -976,6 +976,7 @@ grub_net_configure_by_dhcpv6_reply (const char *name,
|
|
{
|
|
struct grub_net_network_level_interface *inf;
|
|
grub_dhcp6_options_t dhcp6;
|
|
+ int mask = -1;
|
|
|
|
dhcp6 = grub_dhcp6_options_get (v6h, size);
|
|
if (!dhcp6)
|
|
@@ -1007,6 +1008,10 @@ grub_net_configure_by_dhcpv6_reply (const char *name,
|
|
}
|
|
|
|
grub_dhcp6_options_free (dhcp6);
|
|
+
|
|
+ if (inf)
|
|
+ grub_net_add_ipv6_local (inf, mask);
|
|
+
|
|
return inf;
|
|
}
|
|
|