gluon-wan-dnsmasq: rewrite initfile to use procd #2969
Merged
Conversation
This file contains 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
skorpy2009
approved these changes
Sep 7, 2023
neocturne
reviewed
Sep 10, 2023
|
|
||
| RESOLV_CONF_DIR=/var/gluon/wan-dnsmasq | ||
| RESOLV_CONF=$RESOLV_CONF_DIR/resolv.conf | ||
|
|
||
|
|
||
| start() { | ||
| start_service() { | ||
| mkdir -p $RESOLV_CONF_DIR | ||
| /lib/gluon/wan-dnsmasq/update.lua |
There was a problem hiding this comment.
I just noticed that there may be a race condition between the init script and the hotplug.d call of /lib/gluon/wan-dnsmasq/update.lua (unrelated to this PR, but we might as well fix it now).
I think it should be sufficient to replace the update.lua call here with a touch "$RESOLV_CONF": If the WAN interface is not up at this point yet, update.lua would just have created an empty resolv.conf here, and if it is, a proper resolv.conf has been (or is currently being) created by the hotplug script.
Rewrite the gluon-wan-dnsmasq initfile to use procd. This allows for configuring restart handling by procd in case of a crash. While at it, disable the caching feature optionally used for the regular dnsmasq on the wan dnsmasq. This daemon is only for redirecting DNS requests to use local network resolvers, not introducing caching. Signed-off-by: David Bauer <[email protected]>
blocktrron
force-pushed
the
gluon-wan-dnsmasq-procd
branch
from
9504385
to
64a9478
Compare
neocturne
approved these changes
Sep 19, 2023
|
Successfully created backport PR for |
hafu
pushed a commit
to Freifunk-Potsdam/gluon
that referenced
this pull request
Jun 2, 2024
Rewrite the gluon-wan-dnsmasq initfile to use procd. This allows for configuring restart handling by procd in case of a crash. While at it, disable the caching feature optionally used for the regular dnsmasq on the wan dnsmasq. This daemon is only for redirecting DNS requests to use local network resolvers, not introducing caching. Signed-off-by: David Bauer <[email protected]>
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.
Rewrite the gluon-wan-dnsmasq initfile to use procd. This allows for configuring restart handling by procd in case of a crash.
While at it, disable the caching feature optionally used for the regular dnsmasq on the wan dnsmasq. This daemon is only for redirecting DNS requests to use local network resolvers, not introducing caching.