Fix issues with diversion removal on install/upgrade (#159)

This commit is contained in:
Phill (pssc) 2021-10-27 22:23:17 +01:00 committed by GitHub
parent a13eda0e54
commit ab687fddef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 6 deletions

View file

@ -1,6 +1,6 @@
Package: homeassistant-supervised Package: homeassistant-supervised
Section: base Section: base
Version: 1.0.0 Version: 1.0.1
Priority: optional Priority: optional
Architecture: all Architecture: all
Depends: curl, bash, docker-ce, dbus, network-manager, apparmor, jq, systemd, os-agent Depends: curl, bash, docker-ce, dbus, network-manager, apparmor, jq, systemd, os-agent

View file

@ -4,7 +4,9 @@ function info { echo -e "\e[32m[info] $*\e[39m"; }
function warn { echo -e "\e[33m[warn] $*\e[39m"; } function warn { echo -e "\e[33m[warn] $*\e[39m"; }
function error { echo -e "\e[31m[error] $*\e[39m"; exit 1; } function error { echo -e "\e[31m[error] $*\e[39m"; exit 1; }
# Undo diversions # Undo diversions
function undo_divert () {
dpkg-divert --package homeassistant-supervised --remove --rename \ dpkg-divert --package homeassistant-supervised --remove --rename \
--divert /etc/NetworkManager/NetworkManager.conf.real /etc/NetworkManager/NetworkManager.conf --divert /etc/NetworkManager/NetworkManager.conf.real /etc/NetworkManager/NetworkManager.conf
@ -16,3 +18,11 @@ dpkg-divert --package homeassistant-supervised --remove --rename \
dpkg-divert --package homeassistant-supervised --remove --rename \ dpkg-divert --package homeassistant-supervised --remove --rename \
--divert /etc/network/interfaces.real /etc/network/interfaces --divert /etc/network/interfaces.real /etc/network/interfaces
}
case "$1" in
remove|abort-install|disappear)
info Undo divert on "$@"
undo_divert
;;
esac