ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
From ba1c8a307d0a3f2a606b3c3a6e1619504c47d3da Mon Sep 17 00:00:00 2001
|
|
From: Robert Marshall <rmarshall@redhat.com>
|
|
Date: Mon, 16 Mar 2015 16:34:51 -0400
|
|
Subject: [PATCH 125/206] Update info with grub.cfg netboot selection order
|
|
(#1148650)
|
|
|
|
Added documentation to the grub info page that specifies the order
|
|
netboot clients will use to select a grub configuration file.
|
|
|
|
Resolves rhbz#1148650
|
|
---
|
|
docs/grub.texi | 42 ++++++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 42 insertions(+)
|
|
|
|
diff --git a/docs/grub.texi b/docs/grub.texi
|
|
index 6fdd2a041f7..15a90b26e4d 100644
|
|
--- a/docs/grub.texi
|
|
+++ b/docs/grub.texi
|
|
@@ -2414,6 +2414,48 @@ grub-mknetdir --net-directory=/srv/tftp --subdir=/boot/grub -d /usr/lib/grub/i38
|
|
Then follow instructions printed out by grub-mknetdir on configuring your DHCP
|
|
server.
|
|
|
|
+The grub.cfg file is placed in the same directory as the path output by
|
|
+grub-mknetdir hereafter referred to as FWPATH. GRUB will search for its
|
|
+configuration files in order using the following rules where the appended
|
|
+value corresponds to a value on the client machine.
|
|
+
|
|
+@example
|
|
+@group
|
|
+@samp{(FWPATH)}/grub.cfg-@samp{(UUID OF NIC)}
|
|
+@samp{(FWPATH)}/grub.cfg-@samp{(MAC ADDRESS OF NIC)}
|
|
+@samp{(FWPATH)}/grub.cfg-@samp{(IPv4 OR IPv6 ADDRESS)}
|
|
+@samp{(FWPATH)}/grub.cfg
|
|
+@end group
|
|
+@end example
|
|
+
|
|
+The client will only attempt to look up an IPv6 address config once, however,
|
|
+it will try the IPv4 multiple times. The concrete example below shows what
|
|
+would happen under the IPv4 case.
|
|
+
|
|
+@example
|
|
+@group
|
|
+UUID: 7726a678-7fc0-4853-a4f6-c85ac36a120a
|
|
+MAC: 52:54:00:ec:33:81
|
|
+IPV4: 10.0.0.130 (0A000082)
|
|
+@end group
|
|
+@end example
|
|
+
|
|
+@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-0A000082
|
|
+@samp{(FWPATH)}/grub.cfg-0A00008
|
|
+@samp{(FWPATH)}/grub.cfg-0A0000
|
|
+@samp{(FWPATH)}/grub.cfg-0A000
|
|
+@samp{(FWPATH)}/grub.cfg-0A00
|
|
+@samp{(FWPATH)}/grub.cfg-0A0
|
|
+@samp{(FWPATH)}/grub.cfg-0A
|
|
+@samp{(FWPATH)}/grub.cfg-0
|
|
+@samp{(FWPATH)}/grub.cfg
|
|
+@end group
|
|
+@end example
|
|
+
|
|
After GRUB has started, files on the TFTP server will be accessible via the
|
|
@samp{(tftp)} device.
|
|
|
|
--
|
|
2.15.0
|
|
|