Merge ~paelzer/ubuntu/+source/chrony:bionic-lp1764357 into ubuntu/+source/chrony:ubuntu/devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

Tested from ppa [1] and working in my VM.
That said ready for review.

[1]: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3242

e685f84... by Christian Ehrhardt  on 2018-04-18

Update sources in response to systemd-networkd events (LP: #1718227).

This is reusing the already provided script for NetworkManager.
This script is not hard-tied to NetworkManager as it does not use
and of its provided environment variables.

OTOH the NM scripts are general scripts that are called on any change
and then differentiate between invocation reasons via the environment provided.
But the script for chrony is agnostic to the event types - it just checks if
servers are reachable and calls chronyc online/offline accordingly.

Therefore we just link this script into networkd-dispatcher events to work the
same way. Even if not setting servers offline via loosing an interface, but
instead e.g. using the auto_offline function of chrony and then configuring a
new device it will detect the servers as no-reachable and try to connect the
sources again.

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

3ee0889... by Christian Ehrhardt  on 2018-04-18

changelog: Update sources in response to systemd-networkd events (LP: #1718227).

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

6b7b54b... by Christian Ehrhardt  on 2018-04-18

- d/control: set Recommends to networkd-dispatcher

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

0d4466e... by Christian Ehrhardt  on 2018-04-18

add patches to nm-dispatcher script for networkd-dispatcher

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

[Christian Ehrhardt  (paelzer)]

Added the changes that I brought upstream and the related packaging changes for bug 1718227.

I also updated the version in the PPA.

[Nish Aravamudan (nacc)]

Agree with the changes, please upload tag & upload.

review: Approve

[Steve Langasek (vorlon)]

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

The base file is a conffile, the links are not.
Not in /etc nor in /usr/lib - I think that is ok for now as any changes needed could be done in the one conffile that it is.

I'll add a versioned dependency for the new path and wait until 1765152 is resolved with my upload.
Thanks Steve for letting me know about this!

e14e575... by Christian Ehrhardt  on 2018-04-19

d/control: make networkd-dispatcher dependency versioned for the new path by LP: #1765152

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

659b8a3... by Christian Ehrhardt  on 2018-04-19

d/links: adapt paths for changes by LP: #1765152

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

[Christian Ehrhardt  (paelzer)]

Fixups according to Julians change for bug 1765152 pushed.

a43489f... by Christian Ehrhardt  on 2018-04-19

link targets should be non-absolute

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

[Christian Ehrhardt  (paelzer)]

Tested with my ppa (as I'll upload) and the networkd-dispatcher from -proposed.
All good.

Tags pushed and uploading to bionic(-unapproved)

diff --git a/debian/changelog b/debian/changelog
index 773796a..78c6ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+chrony (3.2-4ubuntu4) bionic; urgency=medium
+
+  * d/postrm: re-establish systemd-timesyncd on removal (LP: #1764357)
+  * Notify chrony to update sources in response to systemd-networkd
+    events (LP: #1718227)
+    - d/links: link dispatcher script to networkd-dispatcher events routable
+      and off
+    - d/control: set Recommends to networkd-dispatcher
+    - d/p/lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch
+    - d/p/lp-1718227-nm-dispatcher-for-networkd.patch
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 16 Apr 2018 17:04:06 +0200
+
 chrony (3.2-4ubuntu3) bionic; urgency=medium
 
   * debian/usr.sbin.chronyd: add cap net_admin for hwtimestamp (LP: #1761327)
diff --git a/debian/control b/debian/control
index 4cb4022..2e2c71f 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Depends: ${misc:Depends},
  lsb-base,
  libcap2-bin,
  adduser
+Recommends: networkd-dispatcher (>= 1.7-0ubuntu3)
 Suggests: dnsutils
 Conflicts: time-daemon, ntp
 Provides: time-daemon
diff --git a/debian/links b/debian/links
 new file mode 100644
index 0000000..71e2c52
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,5 @@
+# Update sources in response to systemd-networkd events (LP: #1718227).
+# This is reusing the NetworkManager dispatch script which has no hard
+# dependency to NetworkManager (not using any of its arguments)
+etc/NetworkManager/dispatcher.d/20-chrony usr/lib/networkd-dispatcher/routable.d/chrony
+etc/NetworkManager/dispatcher.d/20-chrony usr/lib/networkd-dispatcher/off.d/chrony
diff --git a/debian/patches/lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch b/debian/patches/lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch
 new file mode 100644
index 0000000..cf12711
--- /dev/null
+++ b/debian/patches/lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch
@@ -0,0 +1,32 @@
+From b563048ee28d121142a663ac6a598e4c71e2c21d Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <[e-mail]>
+Date: Tue, 13 Feb 2018 11:44:24 +0100
+Subject: [PATCH 1/2] examples: ignore non-up/down events in nm-dispatcher
+ script
+
+Forwarded: no (backport)
+Author: Christian Ehrhardt <[e-mail]>
+Original-Author: Miroslav Lichvar <[e-mail]>
+Origin: upstream, https://git.tuxfamily.org/chrony/chrony.git/commit/?id=b563048ee28d121142a663ac6a598e4c71e2c21d
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1718227
+Last-Update: 2018-04-18
+---
+ examples/chrony.nm-dispatcher | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/examples/chrony.nm-dispatcher b/examples/chrony.nm-dispatcher
+index 51d7fa2..a609a66 100644
+--- a/examples/chrony.nm-dispatcher
++++ b/examples/chrony.nm-dispatcher
+@@ -4,6 +4,8 @@
+ 
+ export LC_ALL=C
+ 
++[ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
++
+ # Check if there is a default route
+ 
+ if /sbin/ip route list 2> /dev/null | grep -q '^default'; then
+-- 
+2.7.4
+
diff --git a/debian/patches/lp-1718227-nm-dispatcher-for-networkd.patch b/debian/patches/lp-1718227-nm-dispatcher-for-networkd.patch
 new file mode 100644
index 0000000..37dc411
--- /dev/null
+++ b/debian/patches/lp-1718227-nm-dispatcher-for-networkd.patch
@@ -0,0 +1,67 @@
+From 8cbc68f28f96d48a7ee128fa91731ca02a598913 Mon Sep 17 00:00:00 2001
+From: Christian Ehrhardt <[e-mail]>
+Date: Wed, 18 Apr 2018 15:44:21 +0200
+Subject: [PATCH 2/2] examples: make nm-dispatcher script usable for
+ networkd-dispatcher
+
+Historically there were plenty of callback based implementations around
+ifupdown via /etc/network/if-up and similar. NetworkManager added the
+dispatcher [1] feature for such a kind of functionality.
+
+But so far a systemd-networkd (only) systemd had no means to handle those
+cases. This is solved by networkd-dispatcher which is currently available
+at least in ArchLinux and Ubuntu.
+It takes away the responsibility to listen on netlink events in each
+application and provides a more classic script-drop-in interface to respond
+to networkd events [3].
+
+This commit makes the NM example compatible to be used by NetworkManager
+dispatcher as well as by networkd-dispatcher. That way we avoid too much
+code duplication and can from now on handle special cases in the
+beginning so that the tail can stay commonly used.
+
+After discussion on IRC the current check differs by checking the
+argument count (only in NetworkManager), if ever needed we could extend
+that to check for known custom environment vars (NetworkManager =>
+CONNECTION_UUID; networkd-dispatcher => OperationalState).
+
+[1]: https://developer.gnome.org/NetworkManager/stable/NetworkManager.html
+[2]: https://github.com/craftyguy/networkd-dispatcher
+[3]: https://github.com/systemd/systemd/blob/master/src/systemd/sd-network.h#L86
+
+Signed-off-by: Christian Ehrhardt <[e-mail]>
+
+Forwarded: no (backport)
+Author: Christian Ehrhardt <[e-mail]>
+Origin: upstream, https://git.tuxfamily.org/chrony/chrony.git/commit/?id=8cbc68f28f96d48a7ee128fa91731ca02a598913
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1718227
+Last-Update: 2018-04-18
+---
+ examples/chrony.nm-dispatcher | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/examples/chrony.nm-dispatcher b/examples/chrony.nm-dispatcher
+index a609a66..8bd7df0 100644
+--- a/examples/chrony.nm-dispatcher
++++ b/examples/chrony.nm-dispatcher
+@@ -1,10 +1,14 @@
+ #!/bin/sh
+-# This is a NetworkManager dispatcher script for chronyd to set its NTP sources
+-# online or offline when a network interface is configured or removed
++# This is a NetworkManager dispatcher / networkd-dispatcher script for
++# chronyd to set its NTP sources online or offline when a network interface
++# is configured or removed
+ 
+ export LC_ALL=C
+ 
+-[ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
++# For NetworkManager consider only up/down events
++[ $# -ge 2 ] && [ "$2" != "up" ] && [ "$2" != "down" ] && exit 0
++
++# Note: for networkd-dispatcher routable.d ~= on and off.d ~= off
+ 
+ # Check if there is a default route
+ 
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 3b2acc6..947a7d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 lp1589780-sys_linux-don-t-keep-CAP_SYS_TIME-with-x-option.patch
+lp-1718227-ignore-non-up-down-events-in-nm-dispatcher.patch
+lp-1718227-nm-dispatcher-for-networkd.patch
diff --git a/debian/postrm b/debian/postrm
index 42f48bc..6fba6b5 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -7,6 +7,15 @@ 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 [ "$(systemctl is-enabled systemd-timesyncd 2>/dev/null)" = "enabled" ] ; then
+        systemctl start systemd-timesyncd
+    fi
+}
+
 case "$1" in
     purge)
         rm -f /var/lib/chrony/*
@@ -30,9 +39,15 @@ case "$1" in
         then
             deluser --quiet --system _chrony > /dev/null 2>&1 || true
         fi
+
+        restore_timesyncd
+    ;;
+
+    remove)
+        restore_timesyncd
     ;;
 
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
     ;;