Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in PXE arch names and add ARM32 and ARM64.

Browse Source
This commit is contained in:
Simon Kelley
2016-05-11 22:15:06 +01:00
parent 8628cd603f
commit 68bea10bbf
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG
View File

@@ -74,7 +74,15 @@ version 2.76
To avoid filling logs in configurations which define To avoid filling logs in configurations which define
many upstream nameservers, don't log more that 30 servers. many upstream nameservers, don't log more that 30 servers.
The number to be logged can be changed as SERVERS_LOGGED The number to be logged can be changed as SERVERS_LOGGED
in src/config.h. in src/config.h.
Swap the values if BC_EFI and x86-64_EFI in --pxe-service.
These were previously wrong due to an error in RFC 4578.
If you're using BC_EFI to boot 64-bit EFI machines, you
will need to update your config.
Add ARM32_EFI and ARM64_EFI as valid architectures in
--pxe-service.
version 2.75 version 2.75

2
man/dnsmasq.8
View File

@@ -1358,7 +1358,7 @@ functions when supported by a suitable DHCP server.
This specifies a boot option which may appear in a PXE boot menu. <CSA> is This specifies a boot option which may appear in a PXE boot menu. <CSA> is
client system type, only services of the correct type will appear in a client system type, only services of the correct type will appear in a
menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86, menu. The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86,
Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI; an Intel_Lean_Client, IA32_EFI, X86-64_EFI, Xscale_EFI, BC_EFI, ARM32_EFI and ARM64_EFI; an
integer may be used for other types. The integer may be used for other types. The
parameter after the menu text may be a file name, in which case dnsmasq acts as a parameter after the menu text may be a file name, in which case dnsmasq acts as a
boot server and directs the PXE client to download the file by TFTP, boot server and directs the PXE client to download the file by TFTP,

3
src/option.c
View File

@@ -3298,7 +3298,8 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
{ {
struct pxe_service *new = opt_malloc(sizeof(struct pxe_service)); struct pxe_service *new = opt_malloc(sizeof(struct pxe_service));
char *CSA[] = { "x86PC", "PC98", "IA64_EFI", "Alpha", "Arc_x86", "Intel_Lean_Client", char *CSA[] = { "x86PC", "PC98", "IA64_EFI", "Alpha", "Arc_x86", "Intel_Lean_Client",
"IA32_EFI", "BC_EFI", "Xscale_EFI", "x86-64_EFI", NULL }; "IA32_EFI", "x86-64_EFI", "Xscale_EFI", "BC_EFI",
"ARM32_EFI", "ARM64_EFI", NULL };
static int boottype = 32768; static int boottype = 32768;
new->netid = NULL; new->netid = NULL;