Merge ~paelzer/ubuntu/+source/chrony:lp-1872183-timesyncd-conflict-BIONIC into ubuntu/+source/chrony:ubuntu/bionic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1872183-chrony-starts-timesyncd/

[Balint Reczey (rbalint)]

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks Rbalint for the review.

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/chrony
 * [new tag] upload/3.2-4ubuntu4.3 -> upload/3.2-4ubuntu4.3

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading chrony_3.2-4ubuntu4.3.dsc: done.
  Uploading chrony_3.2-4ubuntu4.3.debian.tar.xz: done.
  Uploading chrony_3.2-4ubuntu4.3_source.buildinfo: done.
  Uploading chrony_3.2-4ubuntu4.3_source.changes: done.
Successfully uploaded packages.

Let us see what the release team thinks

diff --git a/debian/changelog b/debian/changelog
index 7e2efd8..437edcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chrony (3.2-4ubuntu4.3) bionic; urgency=medium
+
+  * d/postrm: gracefully ignore issues on starting systemd-timesyncd
+    (LP: #1872183)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 15 Apr 2020 09:06:43 +0200
+
 chrony (3.2-4ubuntu4.2) bionic; urgency=medium
 
   * d/p/lp-1787366-fall-back-to-urandom.patch: avoid hangs when starting
diff --git a/debian/postrm b/debian/postrm
index 6fba6b5..2727d31 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -12,7 +12,7 @@ restore_timesyncd() {
     # unsynchronized until then. So as the Conflicts in the service file kill
     # systemd-timesyncd re-establish it if it is enabled
     if [ "$(systemctl is-enabled systemd-timesyncd 2>/dev/null)" = "enabled" ] ; then
-        systemctl start systemd-timesyncd
+        deb-systemd-invoke start systemd-timesyncd || true
     fi
 }