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.

Sign up for GitHub

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

Jump to bottom

Fix disk space checking on macOS hosts #1928

Merged
merged 7 commits into from
Apr 7, 2024
Merged

Fix disk space checking on macOS hosts #1928

merged 7 commits into from
Apr 7, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Mar 31, 2024

What does this implement/fix?

Reintroduce a workaround for docker on macOS accidentally removed in bd266d6 and install proper safeguards around HTML escape code during message generation.

Related issue or feature (if applicable): #1925

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.

@DL6ER DL6ER requested a review from a team March 31, 2024 09:29
@DL6ER
Copy link
Member Author

DL6ER commented Mar 31, 2024

Fixes #1925 - Bugfix confirmed by OP in said issue ticket

@DL6ER DL6ER changed the title Fix/check disk Fix disk space checking on macOS hosts Mar 31, 2024
@DL6ER
Use fragment size when computing filesystem sizes
90dda14 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Store message in database as well
5b2dda8 
Signed-off-by: DL6ER <[email protected]>
@DL6ER
Improve diagnosis message adding subroutine to not require manually t…
d88e52d 
…yped in number of arguments and do strict testing against the number of given arguments (instead of crashing if fewer are given and ignoring if more are given)

Signed-off-by: DL6ER <[email protected]>
@DL6ER
Copy link
Member Author

DL6ER commented Apr 1, 2024

Fix confirmed working #1925 (comment)

rdwebdesign
rdwebdesign approved these changes Apr 7, 2024
View reviewed changes
Copy link
Member

@rdwebdesign rdwebdesign left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Approved based on user confirmation.

Also, so far no one reported an issue with this branch.

@DL6ER DL6ER merged commit 0cffd8c into development-v6 Apr 7, 2024
16 checks passed
@DL6ER DL6ER deleted the fix/check_disk branch April 7, 2024 19:01
DL6ER added a commit that referenced this pull request Apr 20, 2024
@DL6ER
Fix a crash resulting from a bad interaction between PRs #1928 and #1930
e29bcb0 


Signed-off-by: DL6ER <[email protected]>
This was referenced Apr 20, 2024
Merged
Closed
DL6ER added a commit that referenced this pull request Apr 21, 2024
@DL6ER
Merge pull request #1936 from pi-hole/fix/connection_error_crash
1b71a44 
Fix a crash resulting from a bad interaction between PRs #1928 and #1930
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdwebdesign rdwebdesign rdwebdesign approved these changes

Assignees
No one assigned
Labels
Bugfix macOS Pi-hole v6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@DL6ER @rdwebdesign