[PATCH 1/1] docs: Small Fixes for Network, Secure Boot, PXE

[Andrew Hamilton <adhamilt@gmail.com>]

Correct documentation for pxe_default_server, pxe_default_gatway, 
and pxe_blksize. Only pxe_default_server is actually used  (alias 
for net_default_server) so capture this, and remove the other two.
Correct documentation for secure boot with UEFI to remove statement 
that chainloader does not work with secure boot, as this was added 
by a previous GRUB update. Correct the documentation for the 
grub.cfg searching via network that will be done based on a given 
MAC address (was missing the Ethernet Type - 01).

Closes: https://savannah.gnu.org/bugs/?54480
Closes: https://savannah.gnu.org/bugs/?62004
Closes: https://savannah.gnu.org/bugs/?65152

Signed-off-by: Andrew Hamilton <adhamilt@gmail.com>
---
 docs/grub.texi | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/docs/grub.texi b/docs/grub.texi
index a050dc0fc..69ddf09e2 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2571,7 +2571,7 @@ value corresponds to a value on the client machine.
 @example
 @group
 @samp{(FWPATH)}/grub.cfg-@samp{(UUID OF MACHINE)}
-@samp{(FWPATH)}/grub.cfg-@samp{(MAC ADDRESS OF NIC)}
+@samp{(FWPATH)}/grub.cfg-01-@samp{(MAC ADDRESS OF NIC)}
 @samp{(FWPATH)}/grub.cfg-@samp{(IPv4 OR IPv6 ADDRESS)}
 @samp{(FWPATH)}/grub.cfg
 @end group
@@ -2596,7 +2596,7 @@ IPV4: 10.0.0.130 (0A000082)
 @example
 @group
 @samp{(FWPATH)}/grub.cfg-7726a678-7fc0-4853-a4f6-c85ac36a120a
-@samp{(FWPATH)}/grub.cfg-52-54-00-ec-33-81
+@samp{(FWPATH)}/grub.cfg-01-52-54-00-ec-33-81
 @samp{(FWPATH)}/grub.cfg-0A000082
 @samp{(FWPATH)}/grub.cfg-0A00008
 @samp{(FWPATH)}/grub.cfg-0A0000
@@ -2680,6 +2680,9 @@ The default interface's MAC address.  Read-only.  This is alias for the
 The default server used by network drives (@pxref{Device syntax}).  Read-write,
 although setting this is only useful before opening a network device.
 
+@item pxe_default_server
+This performs the same function as @samp{net_default_server}.
+
 @end table
 
 
@@ -3310,8 +3313,6 @@ These variables have special meaning to GRUB.
 * net_default_server::
 * pager::
 * prefix::
-* pxe_blksize::
-* pxe_default_gateway::
 * pxe_default_server::
 * root::
 * shim_lock::
@@ -3755,18 +3756,6 @@ dynamically loaded from this directory, so it must be set correctly in order
 for many parts of GRUB to work.
 
 
-@node pxe_blksize
-@subsection pxe_blksize
-
-@xref{Network}.
-
-
-@node pxe_default_gateway
-@subsection pxe_default_gateway
-
-@xref{Network}.
-
-
 @node pxe_default_server
 @subsection pxe_default_server
 
@@ -6579,13 +6568,13 @@ secure boot chain.
 @node UEFI secure boot and shim
 @section UEFI secure boot and shim support
 
-The GRUB, except the @command{chainloader} command, works with the UEFI secure
-boot and the shim. This functionality is provided by the shim_lock verifier. It
-is built into the @file{core.img} and is registered if the UEFI secure boot is
-enabled. The @samp{shim_lock} variable is set to @samp{y} when shim_lock verifier
-is registered. If it is desired to use UEFI secure boot without shim, one can
-disable shim_lock by disabling shim verification with MokSbState UEFI variable
-or by building grub image with @samp{--disable-shim-lock} option.
+The GRUB works with UEFI secure boot and the shim. This functionality is
+provided by the shim_lock verifier. It is built into the @file{core.img} and is
+registered if the UEFI secure boot is enabled. The @samp{shim_lock} variable is
+set to @samp{y} when shim_lock verifier is registered. If it is desired to use
+UEFI secure boot without shim, one can disable shim_lock by disabling shim
+verification with MokSbState UEFI variable or by building grub image with
+@samp{--disable-shim-lock} option.
 
 All GRUB modules not stored in the @file{core.img}, OS kernels, ACPI tables,
 Device Trees, etc. have to be signed, e.g, using PGP. Additionally, the commands
-- 
2.39.2


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel