Conversation
[v1.x] Preserve existing Merlin dnsmasq.postconf content
[v1.x] Use Merlin DNS hooks for main and SDN dnsmasq
[v1.x] Harden Asuswrt-Merlin service lifecycle
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.
Closes #342
Related to #229.
Summary
This updates the maintained v1.x Asuswrt-Merlin integration to coexist safely with shared Merlin hooks, support Merlin 3006 Guest Network Pro / SDN through the supported extension points, and harden ctrld's service lifecycle and self-upgrade behavior.
Shared dnsmasq hook coexistence
exit 0;Merlin 3006 / Guest Network Pro / SDN
dnsmasq.postconfanddnsmasq-sdn.postconf;conf-file=,conf-dir=andconf-script=includes during verification;dnsmasq-N.confSDN replacements;Merlin service lifecycle
ctrld.startup;/proc/<pid>/cmdlineand signal the same validated PID;Compatibility
This targets the maintained
v1.0line.The v1.x dnsmasq implementation deliberately retains
text/template; the unrelatedmain-branchhtml/templatechange is not included.Validation
The final combined branch was validated with:
go test -race ./...All three CI jobs pass on the final combined tree.
The implementation was developed as independently reviewed/staged changes for hook coexistence, DNS/SDN integration and service lifecycle before being combined on the v1.x maintenance line.