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

Increase compatibility with volumes on network shares #2218

Merged
merged 2 commits into from
Feb 21, 2025

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 20, 2025

What does this implement/fix?

Also try writing lock file if we cannot acquire an exclusive lock on the file (e.g., mounted on a network share)


Related issue or feature (if applicable): N/A

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.

…the file (e.g., mounted on a network share)

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

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Will wait for feedback from pi-hole/docker-pi-hole#1715

@DL6ER
Copy link
Member Author

DL6ER commented Feb 21, 2025

Confirmed by two users in the linked docker issue.

@yubiuser
Copy link
Member

Shouldn't the error be turned into a warning? It's nothing the users can fix and we proceed anyway.

@PromoFaux PromoFaux merged commit b3af79f into development Feb 21, 2025
19 checks passed
@PromoFaux PromoFaux deleted the tweak/file_locking branch February 21, 2025 21:23
@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/v6-post-release-fixes-and-findings/76480/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants