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

DietPi-Software | ADS-B Feeder: Harden uninstall and fix beta tags #6661

Merged
merged 8 commits into from
Oct 12, 2023
Merged

DietPi-Software | ADS-B Feeder: Harden uninstall and fix beta tags #6661

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98ec4a8
correctly show beta tags
dirkhh Oct 3, 2023
b047355
ADS-B Feeder: improve service integration
dirkhh Oct 3, 2023
3bf4c7f
Update dietpi/dietpi-software
dirkhh Oct 8, 2023
4ab0acf
remove unwanted service files
dirkhh Oct 8, 2023
5604c7f
run upstream cleanup script
dirkhh Oct 8, 2023
349fa52
improve the patch to remove services that might be still around
dirkhh Oct 9, 2023
f420450
v8.23
MichaIng Oct 12, 2023
385f6a9
v8.23
MichaIng Oct 12, 2023
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
4 changes: 4 additions & 0 deletions .update/patches
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1480,6 +1480,10 @@ Patch_8_23()
G_EXEC_OUTPUT=1 G_EXEC dpkg -i --force-confdef,confold package.deb
G_EXEC rm package.deb
fi
# ADS-B Feeder used to install two service files that aren't needed
# the names should be specific enough to make an unconditional force remove acceptable
G_EXEC rm -f /etc/systemd/system/adsb-update.service
G_EXEC rm -f /etc/systemd/system/adsb-update.timer
MichaIng marked this conversation as resolved.
Show resolved Hide resolved
}

# v6.35 => v7 migration
Expand Down
8 changes: 4 additions & 4 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12015,11 +12015,13 @@ _EOF_
# remove the service that isn't needed for an app install on DietPi and install the rest
G_EXEC cd /tmp/adsb-feeder/src/modules/adsb-feeder/filesystem/root
G_EXEC rm ./usr/lib/systemd/system/adsb-bootstrap.service
G_EXEC rm ./usr/lib/systemd/system/adsb-update.service
G_EXEC rm ./usr/lib/systemd/system/adsb-update.timer
MichaIng marked this conversation as resolved.
Show resolved Hide resolved
G_EXEC mv ./usr/lib/systemd/system/* /etc/systemd/system/

# determine the version
local ADSB_FEEDER_DATE_COMPONENT=$(git log -20 --date='format:%y%m%d' --format='%ad' | uniq -c | mawk '{print $2"."$1;exit}')
local ADSB_FEEDER_TAG_COMPONENT=$(git describe --match 'v[0-9]*' | cut -d- -f1)
local ADSB_FEEDER_TAG_COMPONENT=$(git describe --match 'v[0-9]*' --long | sed 's/-[0-9]*-g[0-9a-f]*//')
local ADSB_FEEDER_VERSION="$ADSB_FEEDER_TAG_COMPONENT(dietpi)-$ADSB_FEEDER_DATE_COMPONENT"

# create the target directory for the app and populated with the code from the git checkout
Expand Down Expand Up @@ -12814,11 +12816,9 @@ If no WireGuard (auto)start is included, but you require it, please do the follo
if To_Uninstall 141 # ADS-B Feeder
then
G_EXEC_NOHALT=1 G_EXEC_OUTPUT=1 G_EXEC /opt/adsb/docker-compose-adsb down
Remove_Service adsb-bootstrap
Remove_Service adsb-docker
Remove_Service adsb-feeder-update
Remove_Service adsb-setup
Remove_Service adsb-update
command -v docker &> /dev/null && G_EXEC docker image prune -a -f
MichaIng marked this conversation as resolved.
Show resolved Hide resolved
G_EXEC rm -Rf /opt/adsb /mnt/dietpi_userdata/adsb-feeder /opt/adsb-feeder-update
fi

Expand Down