summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-04-25 11:44:00 +0200
committerSimon Rettberg2018-04-25 11:44:00 +0200
commit20d22673eb4f9481bc2ae9fdb786f3d7e467bcbe (patch)
tree8835de4252e8ff05872826e624c15c8bde921c64
parent[SSPS] Add php-soap (infoscreen exchange backend) (diff)
downloadsetup-scripts-20d22673eb4f9481bc2ae9fdb786f3d7e467bcbe.tar.gz
setup-scripts-20d22673eb4f9481bc2ae9fdb786f3d7e467bcbe.tar.xz
setup-scripts-20d22673eb4f9481bc2ae9fdb786f3d7e467bcbe.zip
[SSUS] Properly stop and remove atftpd
-rw-r--r--satellit_upgrader/updater.template.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/satellit_upgrader/updater.template.sh b/satellit_upgrader/updater.template.sh
index dbd08ba..2a98f16 100644
--- a/satellit_upgrader/updater.template.sh
+++ b/satellit_upgrader/updater.template.sh
@@ -441,12 +441,19 @@ if which "atftpd" &>/dev/null || dpkg-query -W -f='${db:Status-Abbrev}' "atftpd"
|| ! which "in.tftpd" &>/dev/null; then
if diffcp "tftpd/tftpd-hpa" "/etc/default/tftpd-hpa"; then
echo "Replacing atftpd with tftpd-hpa"
+ systemctl stop atftpd.service
failprint apt-get remove -y atftpd || pwarning "Could not uninstall atftpd"
failprint apt-get install -y tftpd-hpa || perror "Could not install tftpd-hpa"
chg=true
fi
fi
+if [ -e "/etc/systemd/system/atftpd.service" ]; then
+ systemctl stop atftpd.service
+ rm -f -- "/etc/systemd/system/atftpd.service" "/etc/systemd/system/multi-user.target.wants/atftpd.service"
+ chg=true
+fi
+
diffcp "tftpd/tftpd-hpa" "/etc/default/tftpd-hpa" && chg=true
diffcp "tftpd/tftpd-hpa.service" "/etc/systemd/system/tftpd-hpa.service" && chg=true
if "$chg"; then