From 6165523235e3f2f9c85f818d692a89160edd6a96 Mon Sep 17 00:00:00 2001
From: Gary Swalling <31018813+gjswalling@users.noreply.github.com>
Date: Thu, 30 May 2024 16:33:20 -0700
Subject: [PATCH] drop msgs from net.c, add to normal/main.c instead

---
 SPECS/grub2/g-norm.patch | 20 +++++++++++++++++++
 SPECS/grub2/gnet.patch   | 42 ----------------------------------------
 2 files changed, 20 insertions(+), 42 deletions(-)
 create mode 100644 SPECS/grub2/g-norm.patch
 delete mode 100644 SPECS/grub2/gnet.patch

diff --git a/SPECS/grub2/g-norm.patch b/SPECS/grub2/g-norm.patch
new file mode 100644
index 00000000000..f913058d9d6
--- /dev/null
+++ b/SPECS/grub2/g-norm.patch
@@ -0,0 +1,20 @@
+--- a/grub-core/normal/main.c	2023-12-20 07:54:46.000000000 -0800
++++ b/grub-core/normal/main.c	2024-05-30 16:20:31.000000000 -0700
+@@ -263,6 +263,7 @@
+   grub_menu_t menu = 0;
+   const char *prefix;
+ 
++  grub_printf ("GJS: grub_normal_execute entered config %s, nested %d, batch %d\n", config, nested, batch);
+   if (! nested)
+     {
+       prefix = grub_env_get ("prefix");
+@@ -274,7 +275,9 @@
+ 
+   if (config)
+     {
++      grub_printf ("GJS: grub_normal_execute reading config %s, prefix %s\n", config, prefix);
+       menu = read_config_file (config);
++      grub_printf ("GJS: grub_normal_execute read menu %s\n", menu);
+ 
+       /* Ignore any error.  */
+       grub_errno = GRUB_ERR_NONE;
diff --git a/SPECS/grub2/gnet.patch b/SPECS/grub2/gnet.patch
deleted file mode 100644
index ca9165fd9b3..00000000000
--- a/SPECS/grub2/gnet.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/grub-core/net/net.c	2023-12-20 07:54:46.000000000 -0800
-+++ b/grub-core/net/net.c	2024-05-16 16:15:30.151362098 -0700
-@@ -1885,6 +1885,7 @@
-       grub_file_t file;
- 
-       grub_dprintf ("net", "attempt to fetch config %s\n", config);
-+      grub_printf ("GJS: attempt %d config %s, suffix %s\n", num_tries, config, suffix);
- 
-       file = grub_file_open (config, GRUB_FILE_TYPE_CONFIG);
- 
-@@ -1943,6 +1944,7 @@
-       if (client_uuid)
-         {
-           grub_strcpy (suffix, client_uuid);
-+          grub_printf ("GJS: uuid config %s, suffix %s\n", config, suffix);
-           if (grub_config_search_through (config, suffix, 1, 0) == 0)
-             return GRUB_ERR_NONE;
-         }
-@@ -1958,6 +1960,7 @@
-         if (*ptr == ':')
-           *ptr = '-';
- 
-+      grub_printf ("GJS: enet config %s, suffix %s\n", config, suffix);
-       if (grub_config_search_through (config, suffix, 1, 0) == 0)
-         return GRUB_ERR_NONE;
- 
-@@ -1973,6 +1976,7 @@
-                            ((n >> 24) & 0xff), ((n >> 16) & 0xff),      \
-                            ((n >> 8) & 0xff), ((n >> 0) & 0xff));
- 
-+            grub_printf ("GJS: IPaddr config %s, suffix %s\n", config, suffix);
-             if (grub_config_search_through (config, suffix, 8, 1) == 0)
-               return GRUB_ERR_NONE;
-             break;
-@@ -1990,6 +1994,7 @@
-                 *ptr = '-';
- 
-             grub_snprintf (suffix, GRUB_NET_MAX_STR_ADDR_LEN, "%s", buf);
-+            grub_printf ("GJS: IPv6 config %s, suffix %s\n", config, suffix);
-             if (grub_config_search_through (config, suffix, 1, 0) == 0)
-               return GRUB_ERR_NONE;
-             break;