mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +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>
108 lines
3.9 KiB
Diff
108 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 10 Jul 2019 23:58:28 +0200
|
|
Subject: [PATCH] bootp: Add processing DHCPACK packet from HTTP Boot
|
|
|
|
The vendor class identifier with the string "HTTPClient" is used to denote the
|
|
packet as responding to HTTP boot request. In DHCP4 config, the filename for
|
|
HTTP boot is the URL of the boot file while for PXE boot it is the path to the
|
|
boot file. As a consequence, the next-server becomes obseleted because the HTTP
|
|
URL already contains the server address for the boot file. For DHCP6 config,
|
|
there's no difference definition in existing config as dhcp6.bootfile-url can
|
|
be used to specify URL for both HTTP and PXE boot file.
|
|
|
|
This patch adds processing for "HTTPClient" vendor class identifier in DHCPACK
|
|
packet by treating it as HTTP format, not as the PXE format.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
Signed-off-by: Ken Lin <ken.lin@hpe.com>
|
|
---
|
|
grub-core/net/bootp.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
include/grub/net.h | 1 +
|
|
2 files changed, 56 insertions(+)
|
|
|
|
diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
|
|
index 85adc9cb447..2e46842e829 100644
|
|
--- a/grub-core/net/bootp.c
|
|
+++ b/grub-core/net/bootp.c
|
|
@@ -20,6 +20,7 @@
|
|
#include <grub/env.h>
|
|
#include <grub/i18n.h>
|
|
#include <grub/command.h>
|
|
+#include <grub/net.h>
|
|
#include <grub/net/ip.h>
|
|
#include <grub/net/netbuff.h>
|
|
#include <grub/net/udp.h>
|
|
@@ -567,6 +568,60 @@ grub_net_configure_by_dhcp_ack (const char *name,
|
|
if (opt && opt_len)
|
|
grub_env_set_net_property (name, "rootpath", (const char *) opt, opt_len);
|
|
|
|
+ opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER, &opt_len);
|
|
+ if (opt && opt_len)
|
|
+ {
|
|
+ grub_env_set_net_property (name, "vendor_class_identifier", (const char *) opt, opt_len);
|
|
+ if (opt && grub_strcmp (opt, "HTTPClient") == 0)
|
|
+ {
|
|
+ char *proto, *ip, *pa;
|
|
+
|
|
+ if (!dissect_url (bp->boot_file, &proto, &ip, &pa))
|
|
+ return inter;
|
|
+
|
|
+ grub_env_set_net_property (name, "boot_file", pa, grub_strlen (pa));
|
|
+ if (is_def)
|
|
+ {
|
|
+ grub_net_default_server = grub_strdup (ip);
|
|
+ grub_env_set ("net_default_interface", name);
|
|
+ grub_env_export ("net_default_interface");
|
|
+ }
|
|
+ if (device && !*device)
|
|
+ {
|
|
+ *device = grub_xasprintf ("%s,%s", proto, ip);
|
|
+ grub_print_error ();
|
|
+ }
|
|
+ if (path)
|
|
+ {
|
|
+ *path = grub_strdup (pa);
|
|
+ grub_print_error ();
|
|
+ if (*path)
|
|
+ {
|
|
+ char *slash;
|
|
+ slash = grub_strrchr (*path, '/');
|
|
+ if (slash)
|
|
+ *slash = 0;
|
|
+ else
|
|
+ **path = 0;
|
|
+ }
|
|
+ }
|
|
+ grub_net_add_ipv4_local (inter, mask);
|
|
+ inter->dhcp_ack = grub_malloc (size);
|
|
+ if (inter->dhcp_ack)
|
|
+ {
|
|
+ grub_memcpy (inter->dhcp_ack, bp, size);
|
|
+ inter->dhcp_acklen = size;
|
|
+ }
|
|
+ else
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+
|
|
+ grub_free (proto);
|
|
+ grub_free (ip);
|
|
+ grub_free (pa);
|
|
+ return inter;
|
|
+ }
|
|
+ }
|
|
+
|
|
opt = find_dhcp_option (bp, size, GRUB_NET_BOOTP_EXTENSIONS_PATH, &opt_len);
|
|
if (opt && opt_len)
|
|
grub_env_set_net_property (name, "extensionspath", (const char *) opt, opt_len);
|
|
diff --git a/include/grub/net.h b/include/grub/net.h
|
|
index aedf4b59cfe..ebb569bd86e 100644
|
|
--- a/include/grub/net.h
|
|
+++ b/include/grub/net.h
|
|
@@ -526,6 +526,7 @@ enum
|
|
GRUB_NET_BOOTP_DOMAIN = 0x0f,
|
|
GRUB_NET_BOOTP_ROOT_PATH = 0x11,
|
|
GRUB_NET_BOOTP_EXTENSIONS_PATH = 0x12,
|
|
+ GRUB_NET_BOOTP_VENDOR_CLASS_IDENTIFIER = 0x3C,
|
|
GRUB_NET_BOOTP_CLIENT_ID = 0x3d,
|
|
GRUB_NET_BOOTP_CLIENT_UUID = 0x61,
|
|
GRUB_NET_DHCP_REQUESTED_IP_ADDRESS = 50,
|