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

Change references to gPXE to iPXE.

Browse Source 
Development of EtherBoot gPXE was always development
of iPXE core developer Michael Brown.

http://git.etherboot.org/?p=gpxe.git was last updated in 2011
https://git.ipxe.org/ipxe.git is well alive

This  s/gPXE/iPXE/ reflects that.

Signed-off-by: Geert Stappers <stappers@stappers.nl>
This commit is contained in:
Geert Stappers
2018-01-13 17:56:37 +00:00
committed by Simon Kelley
parent e541245987
commit c7e6aea81b
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -2054,13 +2054,13 @@ version 2.47
Support arbitrarily encapsulated DHCP options, suggestion Support arbitrarily encapsulated DHCP options, suggestion
and initial patch from Samium Gromoff. This is useful for and initial patch from Samium Gromoff. This is useful for
(eg) gPXE, which expect all its private options to be (eg) iPXE, which expect all its private options to be
encapsulated inside a single option 175. So, eg, encapsulated inside a single option 175. So, eg,
dhcp-option = encap:175, 190, "iscsi-client0" dhcp-option = encap:175, 190, "iscsi-client0"
dhcp-option = encap:175, 191, "iscsi-client0-secret" dhcp-option = encap:175, 191, "iscsi-client0-secret"
will provide iSCSI parameters to gPXE. will provide iSCSI parameters to iPXE.
Enhance --dhcp-match to allow testing of the contents of a Enhance --dhcp-match to allow testing of the contents of a
client-sent option, as well as its presence. This client-sent option, as well as its presence. This

2
CHANGELOG.archive
View File

@@ -2433,7 +2433,7 @@ version 2.41
Add --dhcp-match flag, to check for arbitrary options in Add --dhcp-match flag, to check for arbitrary options in
DHCP messages from clients. This enables use of dnsmasq DHCP messages from clients. This enables use of dnsmasq
with gPXE. Thanks to Rance Hall for the suggestion. with iPXE. Thanks to Rance Hall for the suggestion.
Added --dhcp-broadcast, to force broadcast replies to DHCP Added --dhcp-broadcast, to force broadcast replies to DHCP
clients which need them but are too dumb or too old to clients which need them but are too dumb or too old to

14
dnsmasq.conf.example
View File

@@ -444,14 +444,14 @@
# The same as above, but use custom tftp-server instead machine running dnsmasq # The same as above, but use custom tftp-server instead machine running dnsmasq
#dhcp-boot=pxelinux,server.name,192.168.1.100 #dhcp-boot=pxelinux,server.name,192.168.1.100
# Boot for Etherboot gPXE. The idea is to send two different # Boot for iPXE. The idea is to send two different
# filenames, the first loads gPXE, and the second tells gPXE what to # filenames, the first loads iPXE, and the second tells iPXE what to
# load. The dhcp-match sets the gpxe tag for requests from gPXE. # load. The dhcp-match sets the ipxe tag for requests from iPXE.
#dhcp-match=set:gpxe,175 # gPXE sends a 175 option. #dhcp-boot=undionly.kpxe
#dhcp-boot=tag:!gpxe,undionly.kpxe #dhcp-match=set:ipxe,175 # iPXE sends a 175 option.
#dhcp-boot=mybootimage #dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php
# Encapsulated options for Etherboot gPXE. All the options are # Encapsulated options for iPXE. All the options are
# encapsulated within option 175 # encapsulated within option 175
#dhcp-option=encap:175, 1, 5b # priority code #dhcp-option=encap:175, 1, 5b # priority code
#dhcp-option=encap:175, 176, 1b # no-proxydhcp #dhcp-option=encap:175, 176, 1b # no-proxydhcp

2
src/rfc2131.c
View File

@@ -909,7 +909,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index,
if (!workaround && boot) if (!workaround && boot)
{ {
/* Provide the bootfile here, for gPXE, and in case we have no menu items /* Provide the bootfile here, for iPXE, and in case we have no menu items
and set discovery_control = 8 */ and set discovery_control = 8 */
if (boot->next_server.s_addr) if (boot->next_server.s_addr)
mess->siaddr = boot->next_server; mess->siaddr = boot->next_server;