Skip to content

Development #1877

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

Merged
PromoFaux merged 7 commits into from
Aug 4, 2025
Merged

Development #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5b3d3f4
Merge pull request #1872 from pi-hole/master
PromoFaux Jul 22, 2025
9285588
Bump tox from 4.27.0 to 4.28.3 in /test
dependabot[bot] Jul 26, 2025
27fc8ac
Merge pull request #1873 from pi-hole/dependabot/pip/test/development…
yubiuser Jul 26, 2025
5aadf06
Bump tox from 4.28.3 to 4.28.4 in /test
dependabot[bot] Aug 2, 2025
e0bba16
Merge pull request #1875 from pi-hole/dependabot/pip/test/development…
yubiuser Aug 2, 2025
0c1fdcf
Utilise the FTL post-stop script that we install during container build.
PromoFaux Aug 2, 2025
6568ae7
Merge pull request #1876 from pi-hole/fix/1789-maybe
PromoFaux Aug 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ start() {
migrate_gravity

echo " [i] pihole-FTL pre-start checks"
# Remove possible leftovers from previous pihole-FTL processes
rm -f /dev/shm/FTL-* 2>/dev/null
rm -f /run/pihole/FTL.sock
# Run the post stop script to cleanup any remaining artifacts from a previous run
sh /opt/pihole/pihole-FTL-poststop.sh

fix_capabilities
sh /opt/pihole/pihole-FTL-prestart.sh
Expand Down Expand Up @@ -135,6 +134,8 @@ stop() {
FTL_EXIT_CODE=1
fi

sh /opt/pihole/pihole-FTL-poststop.sh

echo ""
echo " [i] pihole-FTL exited with status $FTL_EXIT_CODE"
echo ""
Expand Down
2 changes: 1 addition & 1 deletion test/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest == 8.4.1
pytest-testinfra == 10.2.2
pytest-clarity == 1.0.1
tox == 4.27.0
tox == 4.28.4
# Not adding pytest-xdist as using pytest with n > 1 cores
# causes random issues with the emulated architectures