Merge pull request #1877 from pi-hole/development

Development

Author: PromoFaux

src/start.sh

@@ -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
@@ -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 ""

test/requirements.txt

@@ -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