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

Allow users to skip setting static IP adress #4419

Merged
merged 3 commits into from Nov 6, 2021
Merged

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Nov 1, 2021

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

Please make sure you Sign Off all commits. Pi-hole enforces the DCO.


What does this PR aim to accomplish?:
On distribution using dhcpd we offer users to set a static IP during Pi-hole installation. However, the current implementation forces users with /etc/dhcpcd.conf to set a static IP (take the current or set one manually). There was no way to circumvent this during setup.

This PR adds a third option, to not set any static IP even if /etc/dhcpcd.conf exists.
Fixes #4418

image

Additionally, the PR moves the IP selection to a earlier time point in the installer (before selecting upstream and blocklist) as the welcome warning about the necessity of a static IP address might still be more present.

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser added the PR: Approval Required Open Pull Request, needs approval label Nov 1, 2021
Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wording feels a little off

automated install/basic-install.sh Outdated Show resolved Hide resolved
automated install/basic-install.sh Outdated Show resolved Hide resolved
automated install/basic-install.sh Outdated Show resolved Hide resolved
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@PromoFaux PromoFaux merged commit ac4a975 into development Nov 6, 2021
@PromoFaux PromoFaux deleted the tweal/dhcpd branch November 6, 2021 20:32
@DL6ER DL6ER mentioned this pull request Dec 22, 2021
@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/pi-hole-ftl-v5-12-web-v5-9-and-core-v5-7-released/51795/1

@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/using-pi-hole-dns-resolution-on-pi-hole-host-system/52579/8

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Approval Required Open Pull Request, needs approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Pi-Hole configurator not populating Static IP information from selected interface when not connected
3 participants