Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve dnsmasq syntax check edge case #2231

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Improve dnsmasq syntax check edge case #2231

merged 1 commit into from
Feb 21, 2025

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 21, 2025

What does this implement/fix?

Handle special cases where the dnsmasq syntax check exit too quickly for waitpid to capture it.

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.…for waitpid to capture it

Thank you for your contribution to the Pi-hole Community!

Please read the comments below to help us consider your Pull Request.

We are all volunteers and completing the process outlined will help us review your commits quicker.

Please make sure you

  1. Base your code and PRs against the repositories developmental branch.
  2. Sign Off all commits as we enforce the DCO for all contributions
  3. Sign all your commits as they must have verified signatures
  4. File a pull request for any change that requires changes to our documentation at our documentation repo

What does this PR aim to accomplish?:

How does this PR accomplish the above?:

Link documentation PRs if any are needed to support this PR:


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@DL6ER DL6ER added Waiting for feedback Bug:Discourse Bug reported on Discourse forum labels Feb 21, 2025
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/invalid-configuration-dnsmasq-syntax-check-ok/74928/8

@DL6ER DL6ER mentioned this pull request Feb 21, 2025
5 tasks
@DL6ER DL6ER marked this pull request as ready for review February 21, 2025 08:56
@DL6ER DL6ER merged commit f75b831 into development Feb 21, 2025
19 checks passed
@DL6ER DL6ER deleted the fix/echild branch February 21, 2025 20:24
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/v6-post-release-fixes-and-findings/76480/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug:Discourse Bug reported on Discourse forum Waiting for feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants