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

Check if this is a Pi-hole instead of throwing a random error #297

Merged
merged 2 commits into from
Dec 17, 2022

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 16, 2022

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?:

Today I installed PADD on a device which I thought was a Pi-hole already. The outcome was:

remmina_192 168 2 187_192 168 2 187_20221216-140553

As this error isn't very helpful, this PR checks if this file exists at all before starting PADD.

How does this PR accomplish the above?:

Check if /etc/pihole/setupVars.conf exists. If not, don't (try to) start PADD.

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

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 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 requested a review from a team December 16, 2022 20:35
padd.sh Outdated Show resolved Hide resolved
@yubiuser
Copy link
Member

Do we have /etc/pihole/setupVars.conf on the docker image?
__

Please rebase on development

@DL6ER DL6ER changed the base branch from master to development December 17, 2022 15:10
@DL6ER
Copy link
Member Author

DL6ER commented Dec 17, 2022

Rebased on latest development

padd.sh Outdated Show resolved Hide resolved
Signed-off-by: yubiuser <ckoenig@posteo.de>
@yubiuser yubiuser merged commit d117cb4 into development Dec 17, 2022
@yubiuser yubiuser deleted the fix/check_pihole branch December 17, 2022 15:59
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