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

Revert IPv4 variable change made in commit 4203be5 #132

Merged
merged 6 commits into from
Dec 31, 2020

Conversation

christianboyle
Copy link
Contributor

By submitting this pull request, I confirm the following:
please fill any appropriate checkboxes, e.g: [X]

  • 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?:
A detailed description, screenshots (if necessary), as well as links to any relevant GitHub issues

This reverts a prior change that switched ${IPV4_ADDRESS} to ${pi_ip_address} which resulted in PADD displaying the wlan0 address rather than eth0 as it has historically.

The change was not made to other variants within 4203be5, so presumably it was a mistake.

How does this PR accomplish the above?:
A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix

"IPv4:" "${pi_ip_address}"
changes back to:
"IPv4:" "${IPV4_ADDRESS}"

What documentation changes (if any) are needed to support this PR?:
A detailed list of any necessary changes


  • You must follow the template instructions. Failure to do so will result in your pull request being closed.
  • Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time.

@DL6ER
Copy link
Member

DL6ER commented Sep 23, 2020

@fullburnen What do you think?

@dschaper dschaper added this to the v3.4.1 milestone Sep 29, 2020
@dschaper
Copy link
Member

Can you change the version string to v3.4.1 please?

@christianboyle
Copy link
Contributor Author

I went ahead and bumped the version on this again after rebasing.

@dschaper dschaper merged commit ef5acdc into pi-hole:master Dec 31, 2020
@christianboyle christianboyle deleted the fix_tiny_ipv4 branch January 1, 2021 04:44
@fullburnen
Copy link
Contributor

Sorry, my email notifications all went to spam for some reason and I just saw the mention.

Yes, it was a mistake copied from elsewhere. Thanks for catching this!

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.

4 participants