Control: tags 860463 + patch
Control: tags 860463 + pending
Dear maintainer,
I've prepared an NMU for nodm (versioned as 0.13-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards,
S
diffstat for nodm-0.13 nodm-0.13
changelog | 17 ++++++
control | 1
nodm.init | 3 +
patches/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch | 27 ++++++++++
patches/nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch | 25 +++++++++
patches/series | 2
6 files changed, 74 insertions(+), 1 deletion(-)
diff -Nru nodm-0.13/debian/changelog nodm-0.13/debian/changelog
--- nodm-0.13/debian/changelog 2017-01-23 18:14:46.000000000 +0000
+++ nodm-0.13/debian/changelog 2017-04-27 18:37:16.000000000 +0100
@@ -1,3 +1,20 @@
+nodm (0.13-1.1) unstable; urgency=medium
+
+ * d/p/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch:
+ Order nodm.service after plymouth-quit.service
+ (Closes: #860463 for systemd systems)
+ * d/nodm.init: Ask Plymouth to stop before starting nodm
+ (Closes: #860463 for non-systemd systems)
+ * d/p/nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch:
+ Kill main process with SIGTERM, then kill the whole service with
+ SIGKILL if it is still up after 10 seconds. This approximates the
+ behaviour of the LSB init script under systemd, and prevents a
+ 90 second hang during shutdown under some circumstances.
+ * Remove myself from Uploaders. I do not intend to take long-term
+ responsibility for this package.
+
+ -- Simon McVittie <s...@debian.org> Thu, 27 Apr 2017 18:37:16 +0100
+
nodm (0.13-1) unstable; urgency=medium
* New upstream release.
diff -Nru nodm-0.13/debian/control nodm-0.13/debian/control
--- nodm-0.13/debian/control 2017-01-23 18:12:31.000000000 +0000
+++ nodm-0.13/debian/control 2017-04-27 18:37:16.000000000 +0100
@@ -6,7 +6,6 @@
Joachim Breitner <nome...@debian.org>,
Enrico Zini <enr...@debian.org>,
Mike Gabriel <sunwea...@debian.org>,
- Simon McVittie <s...@debian.org>,
Build-Depends:
debhelper (>= 9),
dpkg-dev (>= 1.16.1.1),
diff -Nru nodm-0.13/debian/nodm.init nodm-0.13/debian/nodm.init
--- nodm-0.13/debian/nodm.init 2017-01-23 17:59:20.000000000 +0000
+++ nodm-0.13/debian/nodm.init 2017-04-27 18:37:16.000000000 +0100
@@ -51,6 +51,9 @@
case "$1" in
start)
+ if [ -x /bin/plymouth ]; then
+ /bin/plymouth quit
+ fi
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
if [ "$NODM_ENABLED" = "no" ] || [ "$NODM_ENABLED" = "false" ]
then
diff -Nru nodm-0.13/debian/patches/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch nodm-0.13/debian/patches/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch
--- nodm-0.13/debian/patches/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch 1970-01-01 01:00:00.000000000 +0100
+++ nodm-0.13/debian/patches/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch 2017-04-27 18:37:16.000000000 +0100
@@ -0,0 +1,27 @@
+From 6acf5fb593159dfc6f8a78d3e256901754e787c8 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <s...@debian.org>
+Date: Sun, 23 Apr 2017 13:23:50 +0100
+Subject: [PATCH] nodm.service: Ask Plymouth to stop before starting nodm
+
+Bug-Debian: https://bugs.debian.org/860463
+Signed-off-by: Simon McVittie <s...@debian.org>
+---
+ nodm.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nodm.service.in b/nodm.service.in
+index 638f919..09119f0 100644
+--- a/nodm.service.in
++++ b/nodm.service.in
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Display manager for automatic session logins
+ Documentation=man:nodm(8)
+-After=systemd-user-sessions.service
++After=plymouth-quit.service systemd-user-sessions.service
+
+ [Service]
+ EnvironmentFile=-/etc/default/nodm
+--
+2.11.0
+
diff -Nru nodm-0.13/debian/patches/nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch nodm-0.13/debian/patches/nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch
--- nodm-0.13/debian/patches/nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch 1970-01-01 01:00:00.000000000 +0100
+++ nodm-0.13/debian/patches/nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch 2017-04-27 18:37:16.000000000 +0100
@@ -0,0 +1,25 @@
+From: Simon McVittie <s...@debian.org>
+Date: Thu, 27 Apr 2017 18:26:38 +0100
+Subject: nodm.service: Use KillMode=mixed with 10 second timeout
+
+For a graceful exit, this should result in almost the same practical
+effect as the use of "--retry 10" in the LSB init script: send SIGTERM
+to main process, wait 10 seconds, send SIGKILL to any remaining
+processes. The difference is that the SIGKILL will catch the entire
+graphical session, not just the nodm processes.
+
+Signed-off-by: Simon McVittie <s...@debian.org>
+---
+ nodm.service.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/nodm.service.in b/nodm.service.in
+index 09119f0..0b7e95b 100644
+--- a/nodm.service.in
++++ b/nodm.service.in
+@@ -8,3 +8,5 @@ EnvironmentFile=-/etc/default/nodm
+ ExecStartPre=/usr/bin/test ${NODM_ENABLED} != no -a ${NODM_ENABLED} != false
+ ExecStart=@sbindir@/nodm $NODM_OPTIONS
+ Restart=always
++KillMode=mixed
++TimeoutStopSec=10
diff -Nru nodm-0.13/debian/patches/series nodm-0.13/debian/patches/series
--- nodm-0.13/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ nodm-0.13/debian/patches/series 2017-04-27 18:37:16.000000000 +0100
@@ -0,0 +1,2 @@
+nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch
+nodm.service-Use-KillMode-mixed-with-10-second-timeo.patch
