Re: [Dnsmasq-discuss] [PATCH] iPXE is gPXE
Patch applied. I hope I'm not walking into an argument here Cheers, Simon. On 05/01/18 07:25, Geert Stappers wrote: > Happy New Year, > > > What is the judgement on the patch below? > > On Wed, Dec 27, 2017 at 08:55:22PM +0100, Geert Stappers wrote: >> 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 >> --- >> CHANGELOG| 4 ++-- >> CHANGELOG.archive| 2 +- >> dnsmasq.conf.example | 16 >> src/rfc2131.c| 2 +- >> 4 files changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/CHANGELOG b/CHANGELOG >> index ae03836..7d7a2b7 100644 >> --- a/CHANGELOG >> +++ b/CHANGELOG >> @@ -2054,13 +2054,13 @@ version 2.47 >> >> Support arbitrarily encapsulated DHCP options, suggestion >> 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, >> >> dhcp-option = encap:175, 190, "iscsi-client0" >> 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 >> client-sent option, as well as its presence. This >> diff --git a/CHANGELOG.archive b/CHANGELOG.archive >> index 2df495b..f4362ca 100644 >> --- a/CHANGELOG.archive >> +++ b/CHANGELOG.archive >> @@ -2433,7 +2433,7 @@ version 2.41 >> >> Add --dhcp-match flag, to check for arbitrary options in >> 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 >> clients which need them but are too dumb or too old to >> diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example >> index 790eaf5..1ccca0c 100644 >> --- a/dnsmasq.conf.example >> +++ b/dnsmasq.conf.example >> @@ -444,14 +444,14 @@ >> # The same as above, but use custom tftp-server instead machine running >> dnsmasq >> #dhcp-boot=pxelinux,server.name,192.168.1.100 >> >> -# Boot for Etherboot gPXE. The idea is to send two different >> -# filenames, the first loads gPXE, and the second tells gPXE what to >> -# load. The dhcp-match sets the gpxe tag for requests from gPXE. >> -#dhcp-match=set:gpxe,175 # gPXE sends a 175 option. >> -#dhcp-boot=tag:!gpxe,undionly.kpxe >> -#dhcp-boot=mybootimage >> - >> -# Encapsulated options for Etherboot gPXE. All the options are >> +# Boot for iPXE. The idea is to send two different >> +# filenames, the first loads iPXE, and the second tells iPXE what to >> +# load. The dhcp-match sets the ipxe tag for requests from iPXE. >> +#dhcp-boot=undionly.kpxe >> +#dhcp-match=set:ipxe,175 # iPXE sends a 175 option. >> +#dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php >> + >> +# Encapsulated options for iPXE. All the options are >> # encapsulated within option 175 >> #dhcp-option=encap:175, 1, 5b # priority code >> #dhcp-option=encap:175, 176, 1b # no-proxydhcp >> diff --git a/src/rfc2131.c b/src/rfc2131.c >> index f3a7e53..270f6a4 100644 >> --- a/src/rfc2131.c >> +++ b/src/rfc2131.c >> @@ -909,7 +909,7 @@ size_t dhcp_reply(struct dhcp_context *context, char >> *iface_name, int int_index, >> >>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 */ >>if (boot->next_server.s_addr) >> mess->siaddr = boot->next_server; >> -- >> 2.11.0 >> > ___ Dnsmasq-discuss mailing list Dnsmasq-discuss@lists.thekelleys.org.uk http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss
Re: [Dnsmasq-discuss] [PATCH] iPXE is gPXE
Happy New Year, What is the judgement on the patch below? On Wed, Dec 27, 2017 at 08:55:22PM +0100, Geert Stappers wrote: > 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 > --- > CHANGELOG| 4 ++-- > CHANGELOG.archive| 2 +- > dnsmasq.conf.example | 16 > src/rfc2131.c| 2 +- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/CHANGELOG b/CHANGELOG > index ae03836..7d7a2b7 100644 > --- a/CHANGELOG > +++ b/CHANGELOG > @@ -2054,13 +2054,13 @@ version 2.47 > > Support arbitrarily encapsulated DHCP options, suggestion > 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, > > dhcp-option = encap:175, 190, "iscsi-client0" > 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 > client-sent option, as well as its presence. This > diff --git a/CHANGELOG.archive b/CHANGELOG.archive > index 2df495b..f4362ca 100644 > --- a/CHANGELOG.archive > +++ b/CHANGELOG.archive > @@ -2433,7 +2433,7 @@ version 2.41 > > Add --dhcp-match flag, to check for arbitrary options in > 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 > clients which need them but are too dumb or too old to > diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example > index 790eaf5..1ccca0c 100644 > --- a/dnsmasq.conf.example > +++ b/dnsmasq.conf.example > @@ -444,14 +444,14 @@ > # The same as above, but use custom tftp-server instead machine running > dnsmasq > #dhcp-boot=pxelinux,server.name,192.168.1.100 > > -# Boot for Etherboot gPXE. The idea is to send two different > -# filenames, the first loads gPXE, and the second tells gPXE what to > -# load. The dhcp-match sets the gpxe tag for requests from gPXE. > -#dhcp-match=set:gpxe,175 # gPXE sends a 175 option. > -#dhcp-boot=tag:!gpxe,undionly.kpxe > -#dhcp-boot=mybootimage > - > -# Encapsulated options for Etherboot gPXE. All the options are > +# Boot for iPXE. The idea is to send two different > +# filenames, the first loads iPXE, and the second tells iPXE what to > +# load. The dhcp-match sets the ipxe tag for requests from iPXE. > +#dhcp-boot=undionly.kpxe > +#dhcp-match=set:ipxe,175 # iPXE sends a 175 option. > +#dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php > + > +# Encapsulated options for iPXE. All the options are > # encapsulated within option 175 > #dhcp-option=encap:175, 1, 5b # priority code > #dhcp-option=encap:175, 176, 1b # no-proxydhcp > diff --git a/src/rfc2131.c b/src/rfc2131.c > index f3a7e53..270f6a4 100644 > --- a/src/rfc2131.c > +++ b/src/rfc2131.c > @@ -909,7 +909,7 @@ size_t dhcp_reply(struct dhcp_context *context, char > *iface_name, int int_index, > > 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 */ > if (boot->next_server.s_addr) > mess->siaddr = boot->next_server; > -- > 2.11.0 > -- Groeten Geert Stappers -- Leven en laten leven ___ Dnsmasq-discuss mailing list Dnsmasq-discuss@lists.thekelleys.org.uk http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss
[Dnsmasq-discuss] [PATCH] iPXE is gPXE
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 --- CHANGELOG| 4 ++-- CHANGELOG.archive| 2 +- dnsmasq.conf.example | 16 src/rfc2131.c| 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ae03836..7d7a2b7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2054,13 +2054,13 @@ version 2.47 Support arbitrarily encapsulated DHCP options, suggestion 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, dhcp-option = encap:175, 190, "iscsi-client0" 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 client-sent option, as well as its presence. This diff --git a/CHANGELOG.archive b/CHANGELOG.archive index 2df495b..f4362ca 100644 --- a/CHANGELOG.archive +++ b/CHANGELOG.archive @@ -2433,7 +2433,7 @@ version 2.41 Add --dhcp-match flag, to check for arbitrary options in 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 clients which need them but are too dumb or too old to diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example index 790eaf5..1ccca0c 100644 --- a/dnsmasq.conf.example +++ b/dnsmasq.conf.example @@ -444,14 +444,14 @@ # The same as above, but use custom tftp-server instead machine running dnsmasq #dhcp-boot=pxelinux,server.name,192.168.1.100 -# Boot for Etherboot gPXE. The idea is to send two different -# filenames, the first loads gPXE, and the second tells gPXE what to -# load. The dhcp-match sets the gpxe tag for requests from gPXE. -#dhcp-match=set:gpxe,175 # gPXE sends a 175 option. -#dhcp-boot=tag:!gpxe,undionly.kpxe -#dhcp-boot=mybootimage - -# Encapsulated options for Etherboot gPXE. All the options are +# Boot for iPXE. The idea is to send two different +# filenames, the first loads iPXE, and the second tells iPXE what to +# load. The dhcp-match sets the ipxe tag for requests from iPXE. +#dhcp-boot=undionly.kpxe +#dhcp-match=set:ipxe,175 # iPXE sends a 175 option. +#dhcp-boot=tag:ipxe,http://boot.ipxe.org/demo/boot.php + +# Encapsulated options for iPXE. All the options are # encapsulated within option 175 #dhcp-option=encap:175, 1, 5b # priority code #dhcp-option=encap:175, 176, 1b # no-proxydhcp diff --git a/src/rfc2131.c b/src/rfc2131.c index f3a7e53..270f6a4 100644 --- a/src/rfc2131.c +++ b/src/rfc2131.c @@ -909,7 +909,7 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, 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 */ if (boot->next_server.s_addr) mess->siaddr = boot->next_server; -- 2.11.0 ___ Dnsmasq-discuss mailing list Dnsmasq-discuss@lists.thekelleys.org.uk http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss