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

Fix static IP not set because of in-line comment #4998

Merged

Conversation

StephanPillhofer
Copy link
Contributor

@StephanPillhofer StephanPillhofer commented Nov 1, 2022

Signed-off-by: Stephan Pillhofer 43667664+StephanPillhofer@users.noreply.github.com

  • What does this PR aim to accomplish?:

Fix a bug which causes the static IP inside the dhcpcd.conf file not be set correctly if inline/trailing comments are used.

  • How does this PR accomplish the above?:

Adjust the used regex expression.

  • What documentation changes (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)

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

yubiuser
yubiuser previously approved these changes Nov 2, 2022
dschaper
dschaper previously approved these changes Nov 2, 2022
@dschaper
Copy link
Member

dschaper commented Nov 2, 2022

Stephan, do you have the ability to sign your commits with an identifier? https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification

auto-merge was automatically disabled November 2, 2022 21:29

Head branch was pushed to by a user without write access

Signed-off-by: Stephan Pillhofer <43667664+StephanPillhofer@users.noreply.github.com>
@dschaper dschaper merged commit f91606b into pi-hole:development Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants