mirror of
https://github.com/netbootxyz/netboot.xyz.git
synced 2026-04-25 15:15:56 +03:00
[PR #953] [MERGED] Implemented support for proxydhcp variables (disbaled by default) #2767
Labels
No labels
Hacktoberfest
Hacktoberfest
bootloader
bsd
bug
confirmed
documentation
duplicate
enhancement
enhancement
enhancement
eol
experimental-merged
freebsd
help wanted
invalid
investigate
ipxe
linux
live-os
memdisk
menu
no-issue-activity
no-issue-activity
pull-request
released
todo
upstream
windows
windows
work-in-progress
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/netboot.xyz#2767
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/netbootxyz/netboot.xyz/pull/953
Author: @notepass
Created: 8/5/2021
Status: ✅ Merged
Merged: 10/24/2021
Merged by: @antonym
Base:
development← Head:development📝 Commits (10+)
e95798eImplemented support for proxydhcp variables (disbaled by default)4ed42deImplemented changes requested in code review8db7022Merge branch 'netbootxyz:development' into development7db4a50Merge branch 'development' of https://github.com/notepass/netboot.xyz into development1d269d7Updated implementation based on repo updatea3e0805Commented in new variable in local-vars and removed proxydhcp output from BIOS netinfo as it isn't supported1aefb66Reverted some of the previous changes, as proxydhcp is supported on some BIOS implementations0313a4aMerge branch 'netbootxyz:development' into development05172b0Fixed proxy detection button press and removed unecesarry pcbios checks4bb595eMerge branch 'development' of github.com:notepass/netboot.xyz into development📊 Changes
3 files changed (+36 additions, -11 deletions)
View changed files
📝
roles/netbootxyz/templates/disks/netboot.xyz.j2(+22 -11)📝
roles/netbootxyz/templates/local-vars.ipxe.j2(+5 -0)📝
roles/netbootxyz/templates/menu/netinfo.ipxe.j2(+9 -0)📄 Description
I've implemented the feature requested in #952
I'm not entirely sure if the type of implementation matches what the project wants. By default netboot.xyz will behave the same as before. Only after a change to "proxy-dhcp-vars.ipxe" is made, the new logic will be enabled.
The overall logic is as follows:
This logic could be simplified by removing the additional config file, but than there could be changes for the end user (e.g. the newly added prompt), or the proxydhcp could be used whenever it is detected. The code can be changed to do either of this, I'm completely open for feedback on this.
Edit: The changes currently only impact UEFI booting, as BIOS booting doesn't seem to have access to proxydhcp info
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.