mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
126 lines
4 KiB
Diff
126 lines
4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 15 Apr 2015 14:48:30 +0800
|
|
Subject: [PATCH] efinet: UEFI IPv6 PXE support
|
|
|
|
When grub2 image is booted from UEFI IPv6 PXE, the DHCPv6 Reply packet is
|
|
cached in firmware buffer which can be obtained by PXE Base Code protocol. The
|
|
network interface can be setup through the parameters in that obtained packet.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
|
---
|
|
grub-core/net/drivers/efi/efinet.c | 2 ++
|
|
include/grub/efi/api.h | 71 +++++++++++++++++++++++---------------
|
|
2 files changed, 46 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
|
|
index 00d7d37b8de..c3db3285b97 100644
|
|
--- a/grub-core/net/drivers/efi/efinet.c
|
|
+++ b/grub-core/net/drivers/efi/efinet.c
|
|
@@ -410,6 +410,8 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
|
|
grub_print_error ();
|
|
if (device && path)
|
|
grub_dprintf ("efinet", "device: `%s' path: `%s'\n", *device, *path);
|
|
+ if (grub_errno)
|
|
+ grub_print_error ();
|
|
}
|
|
else
|
|
{
|
|
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
|
|
index 71d972a3d89..186cf398840 100644
|
|
--- a/include/grub/efi/api.h
|
|
+++ b/include/grub/efi/api.h
|
|
@@ -1499,31 +1499,6 @@ typedef union
|
|
grub_efi_pxe_dhcpv6_packet_t dhcpv6;
|
|
} grub_efi_pxe_packet_t;
|
|
|
|
-#define GRUB_EFI_PXE_MAX_IPCNT 8
|
|
-#define GRUB_EFI_PXE_MAX_ARP_ENTRIES 8
|
|
-#define GRUB_EFI_PXE_MAX_ROUTE_ENTRIES 8
|
|
-
|
|
-typedef struct grub_efi_pxe_ip_filter
|
|
-{
|
|
- grub_efi_uint8_t filters;
|
|
- grub_efi_uint8_t ip_count;
|
|
- grub_efi_uint16_t reserved;
|
|
- grub_efi_ip_address_t ip_list[GRUB_EFI_PXE_MAX_IPCNT];
|
|
-} grub_efi_pxe_ip_filter_t;
|
|
-
|
|
-typedef struct grub_efi_pxe_arp_entry
|
|
-{
|
|
- grub_efi_ip_address_t ip_addr;
|
|
- grub_efi_mac_address_t mac_addr;
|
|
-} grub_efi_pxe_arp_entry_t;
|
|
-
|
|
-typedef struct grub_efi_pxe_route_entry
|
|
-{
|
|
- grub_efi_ip_address_t ip_addr;
|
|
- grub_efi_ip_address_t subnet_mask;
|
|
- grub_efi_ip_address_t gateway_addr;
|
|
-} grub_efi_pxe_route_entry_t;
|
|
-
|
|
typedef struct grub_efi_pxe_icmp_error
|
|
{
|
|
grub_efi_uint8_t type;
|
|
@@ -1549,6 +1524,48 @@ typedef struct grub_efi_pxe_tftp_error
|
|
grub_efi_char8_t error_string[127];
|
|
} grub_efi_pxe_tftp_error_t;
|
|
|
|
+typedef struct {
|
|
+ grub_uint8_t addr[4];
|
|
+} grub_efi_pxe_ipv4_address_t;
|
|
+
|
|
+typedef struct {
|
|
+ grub_uint8_t addr[16];
|
|
+} grub_efi_pxe_ipv6_address_t;
|
|
+
|
|
+typedef struct {
|
|
+ grub_uint8_t addr[32];
|
|
+} grub_efi_pxe_mac_address_t;
|
|
+
|
|
+typedef union {
|
|
+ grub_uint32_t addr[4];
|
|
+ grub_efi_pxe_ipv4_address_t v4;
|
|
+ grub_efi_pxe_ipv6_address_t v6;
|
|
+} grub_efi_pxe_ip_address_t;
|
|
+
|
|
+#define GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT 8
|
|
+typedef struct grub_efi_pxe_ip_filter
|
|
+{
|
|
+ grub_efi_uint8_t filters;
|
|
+ grub_efi_uint8_t ip_count;
|
|
+ grub_efi_uint16_t reserved;
|
|
+ grub_efi_ip_address_t ip_list[GRUB_EFI_PXE_BASE_CODE_MAX_IPCNT];
|
|
+} grub_efi_pxe_ip_filter_t;
|
|
+
|
|
+typedef struct {
|
|
+ grub_efi_pxe_ip_address_t ip_addr;
|
|
+ grub_efi_pxe_mac_address_t mac_addr;
|
|
+} grub_efi_pxe_arp_entry_t;
|
|
+
|
|
+typedef struct {
|
|
+ grub_efi_pxe_ip_address_t ip_addr;
|
|
+ grub_efi_pxe_ip_address_t subnet_mask;
|
|
+ grub_efi_pxe_ip_address_t gw_addr;
|
|
+} grub_efi_pxe_route_entry_t;
|
|
+
|
|
+
|
|
+#define GRUB_EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES 8
|
|
+#define GRUB_EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES 8
|
|
+
|
|
typedef struct grub_efi_pxe_mode
|
|
{
|
|
grub_efi_boolean_t started;
|
|
@@ -1580,9 +1597,9 @@ typedef struct grub_efi_pxe_mode
|
|
grub_efi_pxe_packet_t pxe_bis_reply;
|
|
grub_efi_pxe_ip_filter_t ip_filter;
|
|
grub_efi_uint32_t arp_cache_entries;
|
|
- grub_efi_pxe_arp_entry_t arp_cache[GRUB_EFI_PXE_MAX_ARP_ENTRIES];
|
|
+ grub_efi_pxe_arp_entry_t arp_cache[GRUB_EFI_PXE_BASE_CODE_MAX_ARP_ENTRIES];
|
|
grub_efi_uint32_t route_table_entries;
|
|
- grub_efi_pxe_route_entry_t route_table[GRUB_EFI_PXE_MAX_ROUTE_ENTRIES];
|
|
+ grub_efi_pxe_route_entry_t route_table[GRUB_EFI_PXE_BASE_CODE_MAX_ROUTE_ENTRIES];
|
|
grub_efi_pxe_icmp_error_t icmp_error;
|
|
grub_efi_pxe_tftp_error_t tftp_error;
|
|
} grub_efi_pxe_mode_t;
|