diff -Nru systemd-229/debian/changelog systemd-229/debian/changelog --- systemd-229/debian/changelog 2019-06-26 00:37:26.000000000 +0300 +++ systemd-229/debian/changelog 2019-08-07 15:03:46.000000000 +0300 @@ -1,3 +1,11 @@ +systemd (229-4ubuntu21.23) xenial; urgency=medium + + * d/p/core-change-job-mode-of-manager-triggered-restarts.patch: + - Backport upstream PR#11467 to prevent systemd from failing to restart + failed jobs under certain conditions (LP: #1839290) + + -- Vladimir Kononov Wed, 07 Aug 2019 14:41:31 +0300 + systemd (229-4ubuntu21.22) xenial; urgency=medium [ Dan Streetman ] diff -Nru systemd-229/debian/patches/core-change-job-mode-of-manager-triggered-restarts.patch systemd-229/debian/patches/core-change-job-mode-of-manager-triggered-restarts.patch --- systemd-229/debian/patches/core-change-job-mode-of-manager-triggered-restarts.patch 1970-01-01 03:00:00.000000000 +0300 +++ systemd-229/debian/patches/core-change-job-mode-of-manager-triggered-restarts.patch 2019-08-07 16:17:56.000000000 +0300 @@ -0,0 +1,23 @@ +## Description: change job mode of manager triggered restarts to JOB_REPLACE + Backport upstream patch fixing systemd not restarting jobs + under certain conditions. +## Origin: upstream, https://github.com/systemd/systemd/pull/11467 +## Bug: https://github.com/systemd/systemd/issues/11305 +## Bug: https://github.com/systemd/systemd/issues/3260 +## Bug-Ubuntu: https://bugs.launchpad.net/bugs/1839290 +## Applied-Upstream: commit:03ff2dc71ecb09272d728d458498b44f7f132f51 +## Last-Update: 2019-08-07 +## Author: Vladimir Kononov +Index: systemd-229/src/core/service.c +=================================================================== +--- systemd-229.orig/src/core/service.c ++++ systemd-229/src/core/service.c +@@ -1843,7 +1843,7 @@ static void service_enter_restart(Servic + * restarted. We use JOB_RESTART (instead of the more obvious + * JOB_START) here so that those dependency jobs will be added + * as well. */ +- r = manager_add_job(UNIT(s)->manager, JOB_RESTART, UNIT(s), JOB_FAIL, &error, NULL); ++ r = manager_add_job(UNIT(s)->manager, JOB_RESTART, UNIT(s), JOB_REPLACE, &error, NULL); + if (r < 0) + goto fail; + diff -Nru systemd-229/debian/patches/series systemd-229/debian/patches/series --- systemd-229/debian/patches/series 2019-06-26 00:32:26.000000000 +0300 +++ systemd-229/debian/patches/series 2019-08-07 14:39:15.000000000 +0300 @@ -136,3 +136,4 @@ systemctl-load-unit-if-needed-in-systemctl-is-active.patch ask-password-prevent-buffer-overrow-when-reading-fro.patch Append-snap-bin-to-default-PATH.patch +core-change-job-mode-of-manager-triggered-restarts.patch