On Tue, 02 May 2017 at 08:00:44 +0100, Simon McVittie wrote:
> On Tue, 02 May 2017 at 01:38:15 +0200, Axel Beckert wrote:
> > JFTR: This needs an "|| true" if your init script uses "set -e",
> > otherwise starting or restarting the DM besides a fresh system bootup
> > might fail.
>
> Oh, good point. I should change that for nodm.
I've done a 0-day NMU of nodm with the attached diff to fix this
mistake in my earlier NMU; I hope the nodm maintainers don't mind.
Thanks to Axel Beckert for pointing this out.
S
diffstat for nodm-0.13 nodm-0.13
changelog | 8 ++++++++
nodm.init | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff -Nru nodm-0.13/debian/changelog nodm-0.13/debian/changelog
--- nodm-0.13/debian/changelog 2017-04-27 18:37:16.000000000 +0100
+++ nodm-0.13/debian/changelog 2017-05-02 21:57:24.000000000 +0100
@@ -1,3 +1,11 @@
+nodm (0.13-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * nodm.init: Do not fail to start if plymouth has already been
+ stopped
+
+ -- Simon McVittie <[email protected]> Tue, 02 May 2017 21:57:24 +0100
+
nodm (0.13-1.1) unstable; urgency=medium
* d/p/nodm.service-Ask-Plymouth-to-stop-before-starting-no.patch:
diff -Nru nodm-0.13/debian/nodm.init nodm-0.13/debian/nodm.init
--- nodm-0.13/debian/nodm.init 2017-04-27 18:37:16.000000000 +0100
+++ nodm-0.13/debian/nodm.init 2017-05-02 21:57:24.000000000 +0100
@@ -52,7 +52,7 @@
case "$1" in
start)
if [ -x /bin/plymouth ]; then
- /bin/plymouth quit
+ /bin/plymouth quit || true
fi
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
if [ "$NODM_ENABLED" = "no" ] || [ "$NODM_ENABLED" = "false" ]
