Repository navigation
[v1.x] Use Merlin DNS hooks for main and SDN dnsmasq - #7
Merged
Merged
Conversation
This was referenced Sep 27, 2026
maghuro
changed the base branch from
fix/v1-merlin-postconf-coexistence
to
v1.0
September 27, 2026 20:20
Owner
Author
|
v1.x parity update:
CI on the pre-base-alignment tree passed Ubuntu, macOS and Windows. The current merge-only head is being revalidated by CI. |
maghuro
marked this pull request as ready for review
September 27, 2026 20:23
This was referenced Sep 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Important
Local staging/review draft in the fork only. Upstream contribution guidelines require an issue before any PR.
Stacked on #6 and targeted at the maintained v1.x router-support line. This is the v1.x port of #2.
Summary
Replace the fragile Merlin full-config snapshot model with supported main/SDN hooks and Guest Network Pro handling.
dnsmasq.postconfand Merlin 3006dnsmasq-sdn.postconf;conf-file=,conf-dir=orconf-script=includes are present;dnsmasq-N.confSDN snapshots;Port parity
internal/router/merlin/merlin.go, its regression tests, andinternal/router/nvram/nvram.gonow match the final #2 implementation. The intentional v1.x difference is thatinternal/router/dnsmasq/dnsmasq.goretainstext/templateinstead of the unrelated main-branchhtml/templatechange.Related
Control-D-Inc#229