summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@canonical.com>2017-07-25 11:35:53 +0200
committerJulian Andres Klode <jak@debian.org>2017-09-13 18:23:40 +0200
commitcd53fa0b7ca23ba3e6aa79d858706cf00bd357b6 (patch)
tree8c23f7d6e0b42f5d5c472f2a10e1bcfe7e774264
parentdd547ebaffd2aceb42e2908f1d5f0ab386af6cb1 (diff)
Gracefully terminate process when stopping apt-daily-upgrade
The main process is guessed by systemd. This prevents killing dpkg run by unattended-upgrades in the middle of installing packages and ensures graceful shutdown. The timeout of 900 seconds after which apt-daily-upgrade.service is killed is in sync with unattended-upgrades's timer. LP: #1690980 (cherry picked from commit 78bc10d4702b30b46d802294ac43cffc34d9c431)
-rw-r--r--debian/apt-daily-upgrade.service2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/apt-daily-upgrade.service b/debian/apt-daily-upgrade.service
index bf2776ac8..9652f58fe 100644
--- a/debian/apt-daily-upgrade.service
+++ b/debian/apt-daily-upgrade.service
@@ -7,3 +7,5 @@ After=apt-daily.service
[Service]
Type=oneshot
ExecStart=/usr/lib/apt/apt.systemd.daily install
+KillMode=process
+TimeoutStopSec=900