efi/http: match protocol+hostname of boot url in root_url

This lets you write config files that don't know urls.

Signed-off-by: Peter Jones <pjones@redhat.com>
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Gbp-Pq: Topic network
Gbp-Pq: Name efi-http-match-protocol-hostname-of-boot-url-in-root.patch

diff --git a/grub-core/net/efi/http.c b/grub-core/net/efi/http.c
index 359231bac766d8d67c6a434dff70058b3aec658e..2ec458b62873a9e9e9b53cc6b85abf2c4af59241 100644 (file)
--- a/grub-core/net/efi/http.c
+++ b/grub-core/net/efi/http.c
@@ -3,6 +3,7 @@
 #include <grub/misc.h>
 #include <grub/net/efi.h>
 #include <grub/charset.h>
+#include <grub/env.h>
 
 static void
 http_configure (struct grub_efi_net_device *dev, int prefer_ip6)
@@ -335,6 +336,24 @@ grub_efihttp_open (struct grub_efi_net_device *dev,
   grub_err_t err;
   grub_off_t size = 0;
   char *buf = NULL;
+  char *root_url;
+  grub_efi_ipv6_address_t address;
+  const char *rest;
+
+  if (grub_efi_string_to_ip6_address (file->device->net->server, &address, &rest) && *rest == 0)
+    root_url = grub_xasprintf ("%s://[%s]", type ? "https" : "http", file->device->net->server);
+  else
+    root_url = grub_xasprintf ("%s://%s", type ? "https" : "http", file->device->net->server);
+  if (root_url)
+    {
+      grub_env_unset ("root_url");
+      grub_env_set ("root_url", root_url);
+      grub_free (root_url);
+    }
+  else
+    {
+      return grub_errno;
+    }
 
   err = efihttp_request (dev->http, file->device->net->server, file->device->net->name, type, 1, 0);
   if (err != GRUB_ERR_NONE)