Merge ~paelzer/ubuntu/+source/chrony:lp-1872183-timesyncd-conflict-FOCAL into ubuntu/+source/chrony:ubuntu/focal-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.

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

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading chrony_3.5-6ubuntu4.dsc: done.
  Uploading chrony_3.5-6ubuntu4.debian.tar.xz: done.
  Uploading chrony_3.5-6ubuntu4_source.buildinfo: done.
  Uploading chrony_3.5-6ubuntu4_source.changes: done.
Successfully uploaded packages.

4b4ef4e... by Christian Ehrhardt  on 2020-04-15

d/t/control: harden time-sources-from-dhcp-servers test for systemd change (LP: #1873031)

Signed-off-by: Christian Ehrhardt <email address hidden>

cb8c0c4... by Christian Ehrhardt  on 2020-04-15

changelog: harden time-sources-from-dhcp-servers test for systemd change (LP: #1873031)

Signed-off-by: Christian Ehrhardt <email address hidden>

[Christian Ehrhardt  (paelzer)]

Added a hardening against the systemd change to its own dhcp hook.
=> https://bugs.launchpad.net/ubuntu/+source/chrony/+bug/1873031

Uploaded to Focal

diff --git a/debian/changelog b/debian/changelog
index a69224a..87de9de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+chrony (3.5-6ubuntu5) focal; urgency=medium
+
+  * d/t/control: harden time-sources-from-dhcp-servers test for systemd change
+    (LP: #1873031)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 15 Apr 2020 18:23:10 +0200
+
+chrony (3.5-6ubuntu4) focal; urgency=medium
+
+  * debian/postrm:
+    - Stop starting systemd-timesyncd in postrm. This is no longer relevant
+      since systemd-timesyncd is a standalone package declaring
+      Conflicts/Replaces/Provides: time-daemon. (Closes 955773, LP: #1872183)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 15 Apr 2020 09:01:30 +0200
+
 chrony (3.5-6ubuntu3) focal; urgency=medium
 
   * avoid multiple time services running concurrently (LP: #1870144).
diff --git a/debian/postrm b/debian/postrm
index 649ca81..7f4b5f0 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -7,15 +7,6 @@ set -e
 
 # targets: purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear
 
-restore_timesyncd() {
-    # on next reboot it would start, but that would leave time
-    # unsynchronized until then. So as the Conflicts in the service file kill
-    # systemd-timesyncd re-establish it if it is enabled
-    if [ -d /run/systemd/system ]; then
-        deb-systemd-invoke start systemd-timesyncd || true
-    fi
-}
-
 case "$1" in
     purge)
         rm -f /var/lib/chrony/*
@@ -39,16 +30,9 @@ case "$1" in
         then
             deluser --quiet --system _chrony > /dev/null 2>&1 || true
         fi
-
-        restore_timesyncd
-    ;;
-
-    remove)
-        restore_timesyncd
     ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
     ;;
 
     *)
diff --git a/debian/tests/control b/debian/tests/control
index 680931e..792770a 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -4,7 +4,8 @@ Restrictions: isolation-container, build-needed, skippable, needs-root
 
 Tests: time-sources-from-dhcp-servers
 Depends: @, isc-dhcp-server, isc-dhcp-client, iproute2, kmod
-Restrictions: isolation-machine, needs-root
+# allow-stderr is needed until systemd fixed LP: 1873031
+Restrictions: isolation-machine, needs-root, allow-stderr
 
 Features: test-name=run_system_tests
 Test-Command: debian/tests/upstream-system-tests