[PR #953] [MERGED] Implemented support for proxydhcp variables (disbaled by default) #2767

Closed
opened 2026-03-01 18:41:24 +03:00 by kerem · 0 comments
Owner

📋 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: developmentHead: development


📝 Commits (10+)

  • e95798e Implemented support for proxydhcp variables (disbaled by default)
  • 4ed42de Implemented changes requested in code review
  • 8db7022 Merge branch 'netbootxyz:development' into development
  • 7db4a50 Merge branch 'development' of https://github.com/notepass/netboot.xyz into development
  • 1d269d7 Updated implementation based on repo update
  • a3e0805 Commented in new variable in local-vars and removed proxydhcp output from BIOS netinfo as it isn't supported
  • 1aefb66 Reverted some of the previous changes, as proxydhcp is supported on some BIOS implementations
  • 0313a4a Merge branch 'netbootxyz:development' into development
  • 05172b0 Fixed proxy detection button press and removed unecesarry pcbios checks
  • 4bb595e Merge 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:

  • Check if a proxydhcp is set
    • If no
      • Set the "next-server" provided by the normal DHCP as tftp server
    • If yes
      • Request proxy-dhcp-vars.ipxe from the next-server defined by the normal DHCP to attempt automatic conflict resolution
      • Check the content of the variable "force_use_root_dhcp_settings"
        • If it is true: Use the next-server provided by the normal DHCP server as tftp server
        • If it is false: Use the next-server provided by the proxy DHCP server as tftp server
        • If it is not set or another value: Prompt the user to press F5 to accept the settings from the proxy server. If no key is pressed in 4 seconds, the server provided by the normal DHCP will be used

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.

## 📋 Pull Request Information **Original PR:** https://github.com/netbootxyz/netboot.xyz/pull/953 **Author:** [@notepass](https://github.com/notepass) **Created:** 8/5/2021 **Status:** ✅ Merged **Merged:** 10/24/2021 **Merged by:** [@antonym](https://github.com/antonym) **Base:** `development` ← **Head:** `development` --- ### 📝 Commits (10+) - [`e95798e`](https://github.com/netbootxyz/netboot.xyz/commit/e95798e62c1bac26bad8d330ee47c8cae1d805a8) Implemented support for proxydhcp variables (disbaled by default) - [`4ed42de`](https://github.com/netbootxyz/netboot.xyz/commit/4ed42def6fa80198d33b206c7732c66a58435530) Implemented changes requested in code review - [`8db7022`](https://github.com/netbootxyz/netboot.xyz/commit/8db702257747cbfca57c59e6235abd20e4c487e4) Merge branch 'netbootxyz:development' into development - [`7db4a50`](https://github.com/netbootxyz/netboot.xyz/commit/7db4a50b3e6ea2cd28d1951587c31aa03abb89d7) Merge branch 'development' of https://github.com/notepass/netboot.xyz into development - [`1d269d7`](https://github.com/netbootxyz/netboot.xyz/commit/1d269d7b1005812c64439e29d50dcfdbde425d8c) Updated implementation based on repo update - [`a3e0805`](https://github.com/netbootxyz/netboot.xyz/commit/a3e08052da8ddc5f2f235e3925fc46e9649eaca5) Commented in new variable in local-vars and removed proxydhcp output from BIOS netinfo as it isn't supported - [`1aefb66`](https://github.com/netbootxyz/netboot.xyz/commit/1aefb666ecdb58be987c32f66879ba9cde2598ee) Reverted some of the previous changes, as proxydhcp is supported on some BIOS implementations - [`0313a4a`](https://github.com/netbootxyz/netboot.xyz/commit/0313a4ac85dc00b950a11affc037107c47b6d36d) Merge branch 'netbootxyz:development' into development - [`05172b0`](https://github.com/netbootxyz/netboot.xyz/commit/05172b0df4d204bcc645f0f8faf15001cfe962eb) Fixed proxy detection button press and removed unecesarry pcbios checks - [`4bb595e`](https://github.com/netbootxyz/netboot.xyz/commit/4bb595e10897c096ecb6bfe9399bdc3176570580) Merge branch 'development' of github.com:notepass/netboot.xyz into development ### 📊 Changes **3 files changed** (+36 additions, -11 deletions) <details> <summary>View changed files</summary> 📝 `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) </details> ### 📄 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: * Check if a proxydhcp is set * If no * Set the "next-server" provided by the normal DHCP as tftp server * If yes * Request proxy-dhcp-vars.ipxe from the next-server defined by the normal DHCP to attempt automatic conflict resolution * Check the content of the variable "force_use_root_dhcp_settings" * If it is true: Use the next-server provided by the normal DHCP server as tftp server * If it is false: Use the next-server provided by the proxy DHCP server as tftp server * If it is not set or another value: Prompt the user to press F5 to accept the settings from the proxy server. If no key is pressed in 4 seconds, the server provided by the normal DHCP will be used 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 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-03-01 18:41:24 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/netboot.xyz#2767
No description provided.