Merge PR #502: Remove apt.conf.d/99nymea also without purge option

pull/512/head
Jenkins nymea 2022-03-27 19:49:40 +02:00
commit 10083c361b
4 changed files with 36 additions and 8 deletions

View File

@ -1,7 +0,0 @@
# nymea hook to restart nymead after upgrades that change nymea plugins or libraries
DPkg::Pre-Install-Pkgs {"/usr/libexec/nymea-upgrade-helper"; };
DPkg::Tools::Options::/usr/libexec/nymea-upgrade-helper::Version "1";
DPkg::Post-Invoke {"if [ -e /tmp/nymea-restart-pending ]; then systemctl restart nymead; rm /tmp/nymea-restart-pending; fi"; };

View File

@ -5,5 +5,4 @@ usr/lib/@DEB_HOST_MULTIARCH@/libnymea-core.so.1.0.0
data/systemd/nymead.service /lib/systemd/system/
data/logrotate/nymead /etc/logrotate.d/
data/dbus-1/io.guh.nymead.conf /etc/dbus-1/system.d/
data/dpkg/apt.conf.d/99nymea /etc/apt/apt.conf.d/
data/dpkg/nymea-upgrade-helper /usr/libexec/

View File

@ -29,6 +29,13 @@ else
echo "Failed to set raw socket network capabilities for nymead. Network device discovery will not be available for non root users."
fi
# nymea hook to restart nymead after upgrades that change nymea plugins or libraries
cat <<EOF > /etc/apt/apt.conf.d/99nymea
DPkg::Pre-Install-Pkgs {"/usr/libexec/nymea-upgrade-helper"; };
DPkg::Tools::Options::/usr/libexec/nymea-upgrade-helper::Version "1";
DPkg::Post-Invoke {"if [ -e /tmp/nymea-restart-pending ]; then systemctl restart nymead; rm /tmp/nymea-restart-pending; fi"; };
EOF
#DEBHELPER#
exit 0

29
debian/nymead.prerm vendored Normal file
View File

@ -0,0 +1,29 @@
#!/bin/sh
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# #
# Copyright (C) 2015 - 2022 nymea GmbH <developer@nymea.io> #
# #
# This file is part of nymea. #
# #
# nymea is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, version 2 of the License. #
# #
# nymea is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with nymea. If not, see <http://www.gnu.org/licenses/>. #
# #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# apt remove doesn't remove files from /etc unless --purge is given
# but we want to remove /etc/apt/apt.conf.d/99nymea in any case
rm /etc/apt/apt.conf.d/99nymea
#DEBHELPER#
exit 0