v9.6 (#7133)

- DietPi-Software | ADS-B Feeder: Fix failing service start by adding the missing python requests library and the app flag file.

Signed-off-by: Dirk Hohndel <[email protected]>

CHANGELOG.txt

@@ -46,6 +46,7 @@ Bug fixes:
 - DietPi-Software | Shairport Sync: Resolved a DietPi v9.4 regression, where the AirPlay 2 choice did not have an effect, but the AirPlay 1 package was always installed. Additionally, uninstalling Shairport Sync will now also purge the AirPlay 2 package. Many thanks to @pulpe for fixing this bug: https://github.com/MichaIng/DietPi/pull/7082
 - DietPi-Software | Box64: Resolved an issue where an invalid build target was used on Raspberry Pi 5 with 16k page size kernel. This target was removed with latest Box64, as page size handling is now done at runtime.
 - DietPi-Software | Jellyfin: Resolved an issue where the intended HTTP port change could not be applied, since the network config file is not created anymore at service start. We do now pre-create a minimal one, which is complemented with defaults automatically.
+- DietPi-Software | ADS-B Feeder: Resolved an issue where the service start could have failed because of a missing Python module. Many thanks to @moonraka for reporting the issue and @dirkhh sending a fix quickly: https://dietpi.com/forum/t/ads-b-feeder-not-working/20601
 
 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/7098
 

dietpi/dietpi-software

@@ -11925,18 +11925,14 @@ _EOF_
 			G_EXEC mkdir -p /mnt/dietpi_userdata/adsb-feeder/config
 			G_EXEC ln -s /mnt/dietpi_userdata/adsb-feeder/config .
 
-			# set the 'image name' and version that are shown in the footer of the Web UI
+			# set the 'image name' and version that are shown in the footer of the Web UI and mark as app, not image
 			G_EXEC eval 'echo '\''ADSB Feeder app running on DietPi'\'' > feeder-image.name'
 			G_EXEC eval "echo '$ADSB_FEEDER_VERSION' > adsb.im.version"
+			G_EXEC rm -f os.adsb.feeder.image
+			G_EXEC touch app.adsb.feeder.image
 
-			# get the Python module
-			# for older distros we need to install via pip in order to get flask 2
-			if (( $G_DISTRO < 7 ))
-			then
-				G_EXEC_OUTPUT=1 G_EXEC pip3 install -U flask
-			else
-				G_AGI python3-flask
-			fi
+			# get the Python modules
+			G_EXEC_OUTPUT=1 G_EXEC pip3 install -U flask requests
 
 			# finally ensure that /run allows executables (this is needed for the containers to be able to not do excessive
 			# writes to physical storage - which might be an SD card)