Merge ~paelzer/ubuntu/+source/chrony:fix-1829700-readd-sysV into ubuntu/+source/chrony:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/eoan-chrony-test-service-interaction

TL;DR - dh fixed the ordering in postinst, so we can stop dropping sysV scripts

[Andreas Hasenack (ahasenack)]

If I understand this correctly, the goal here is to just minimize the delta, right?

However, shouldn't we, as a distribution that has adopted systemd, be getting rid of sysv scripts? Don't they introduce confusion, specially when a particular action is not available in the systemd service file, and then the sysv script is used? And vice-versa?

review: Needs Information

[Christian Ehrhardt  (paelzer)]

Debian accepted my other .service related Delta.
Once 3.5 is released we can drop more :-)

[Christian Ehrhardt  (paelzer)]

Andreas - yes the intention here was to drop Delta (that was added without being needed after checking the details of compat 12).

IMHO - Debian seems to hard-bind to keep sysV compat to be a thing.
And I don't think that we would want to Delta everything to no more have those scripts.
Therefore I think we should drop this delta.

If we want to make an Ubuntu wide move, then probably as debhelper delta which make installinit/installsystemd only install the latter if both are present. And not in a per package Delta. That actually is an interesting topic for a Sprint I think (noted).

[Bryce Harrington (bryce)]

LGTM. I doublechecked the init file is identical to the one shipping in debian/sid.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f3070be..7d6b299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+chrony (3.4-4ubuntu2) eoan; urgency=medium
+
+  * Dropped sysV change added in 3.4-4ubuntu1 (LP: #1829700):
+    - removed d/init to avoid weird interactions between sysV and systemd
+    [With debhelper compat level 12 this isn't an issue anymore]
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 22 May 2019 09:10:41 +0200
+
 chrony (3.4-4ubuntu1) eoan; urgency=medium
 
   * Merge with Debian unstable (LP: #1828992). Remaining changes:
diff --git a/debian/init b/debian/init
 new file mode 100644
index 0000000..bc376b5
--- /dev/null
+++ b/debian/init
@@ -0,0 +1,73 @@
+#! /bin/sh
+#
+# Written by Miquel van Smoorenburg <[e-mail]>.
+# Modified for Debian GNU/Linux by Ian Murdock <[e-mail]>.
+# Modified for Debian by Christoph Lameter <[e-mail]>
+# Modified for chrony by John Hasler <[e-mail]> 1998-2012
+# Modified for Debian by Vincent Blut <[e-mail]>
+
+### BEGIN INIT INFO
+# Provides:          chrony
+# Required-Start:    $remote_fs
+# Required-Stop:     $remote_fs
+# Should-Start:      $syslog $network $named $time
+# Should-Stop:       $syslog $network $named $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Controls chronyd NTP time daemon
+# Description:       Chronyd is the NTP time daemon in the Chrony package
+### END INIT INFO
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DAEMON=/usr/sbin/chronyd
+NAME="chronyd"
+DESC="time daemon"
+PIDFILE=/run/chronyd.pid
+CHRONY_HELPER=/usr/lib/chrony/chrony-helper
+
+[ -x "$DAEMON" ] || exit 0
+
+. /lib/lsb/init-functions
+
+# Override this variable by editing /etc/default/chrony.
+DAEMON_OPTS=""
+if [ -f /etc/default/chrony ]; then
+    . /etc/default/chrony
+fi
+
+case "$1" in
+    start)
+        if $0 status > /dev/null ; then
+            log_success_msg "$NAME is already running"
+        else
+            log_daemon_msg "Starting $DESC" "$NAME"
+            start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+            if [ -x $CHRONY_HELPER ]; then
+                $CHRONY_HELPER update-daemon
+            fi
+            log_end_msg $?
+        fi
+        ;;
+
+    stop)
+        log_daemon_msg "Stopping $DESC" "$NAME"
+        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --remove-pidfile --exec $DAEMON
+        log_end_msg $?
+        ;;
+
+    restart|force-reload)
+        $0 stop
+        $0 start
+        ;;
+
+    status)
+        status_of_proc -p $PIDFILE "$DAEMON" "$NAME" && exit 0 || exit $?
+        ;;
+
+    *)
+        log_action_msg "Usage: /etc/init.d/chrony {start|stop|restart|force-reload|status}"
+        exit 1
+        ;;
+esac
+
+exit 0