|
 |
15a2072 |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
15a2072 |
From: Peter Jones <pjones@redhat.com>
|
|
|
15a2072 |
Date: Mon, 30 Jul 2018 16:39:57 -0400
|
|
|
3e07ee7 |
Subject: [PATCH] efi/http: Make root_url reflect the protocol+hostname of our
|
|
|
3e07ee7 |
boot url.
|
|
|
3e07ee7 |
|
|
|
3e07ee7 |
This lets you write config files that don't know urls.
|
|
|
15a2072 |
|
|
|
15a2072 |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
15a2072 |
---
|
|
|
15a2072 |
grub-core/net/efi/http.c | 19 +++++++++++++++++++
|
|
|
15a2072 |
1 file changed, 19 insertions(+)
|
|
|
15a2072 |
|
|
|
15a2072 |
diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
|
|
|
15a2072 |
index 3f61fd2fa5b..243acbaa35b 100644
|
|
|
15a2072 |
--- a/grub-core/net/efi/http.c
|
|
|
15a2072 |
+++ b/grub-core/net/efi/http.c
|
|
|
15a2072 |
@@ -4,6 +4,7 @@
|
|
|
15a2072 |
#include <grub/misc.h>
|
|
|
15a2072 |
#include <grub/net/efi.h>
|
|
|
15a2072 |
#include <grub/charset.h>
|
|
|
15a2072 |
+#include <grub/env.h>
|
|
|
15a2072 |
|
|
|
15a2072 |
static void
|
|
|
15a2072 |
http_configure (struct grub_efi_net_device *dev, int prefer_ip6)
|
|
|
15a2072 |
@@ -351,6 +352,24 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
|
|
|
15a2072 |
grub_err_t err;
|
|
|
15a2072 |
grub_off_t size;
|
|
|
15a2072 |
char *buf;
|
|
|
15a2072 |
+ char *root_url;
|
|
|
15a2072 |
+ grub_efi_ipv6_address_t address;
|
|
|
15a2072 |
+ const char *rest;
|
|
|
15a2072 |
+
|
|
|
15a2072 |
+ if (grub_efi_string_to_ip6_address (file->device->net->server, &address, &rest) && *rest == 0)
|
|
|
15a2072 |
+ root_url = grub_xasprintf ("%s://[%s]", type ? "https" : "http", file->device->net->server);
|
|
|
15a2072 |
+ else
|
|
|
15a2072 |
+ root_url = grub_xasprintf ("%s://%s", type ? "https" : "http", file->device->net->server);
|
|
|
15a2072 |
+ if (root_url)
|
|
|
15a2072 |
+ {
|
|
|
15a2072 |
+ grub_env_unset ("root_url");
|
|
|
15a2072 |
+ grub_env_set ("root_url", root_url);
|
|
|
15a2072 |
+ grub_free (root_url);
|
|
|
15a2072 |
+ }
|
|
|
15a2072 |
+ else
|
|
|
15a2072 |
+ {
|
|
|
15a2072 |
+ return grub_errno;
|
|
|
15a2072 |
+ }
|
|
|
15a2072 |
|
|
|
15a2072 |
err = efihttp_request (dev->http, file->device->net->server, file->device->net->name, type, 1, 0);
|
|
|
15a2072 |
if (err != GRUB_ERR_NONE)
|