From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 14 Jul 2011 16:05:33 +0000 (+0200)
Subject: systemctl: don't try rebooting with /dev/initcl if Upstart worked
X-Git-Tag: v31~50
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a55b298d930543c8065bb9e708dd112562b1736;p=systemd

systemctl: don't try rebooting with /dev/initcl if Upstart worked
---

diff --git a/TODO b/TODO
index 9db73165..8a807b48 100644
--- a/TODO
+++ b/TODO
@@ -22,6 +22,10 @@ Features:
 
 * warn if the user stops a service but not its associated socket
 
+* ensure we always set the facility when logging to kmsg
+
+* service: pid file reading after reload doesn't work, since we don't reset the pid variable
+
 * logind: spawn user@..service on login
 
 * logind: implement shutdown service
diff --git a/src/systemctl.c b/src/systemctl.c
index 840e2ffc..3767e221 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -5112,7 +5112,7 @@ static int talk_upstart(void) {
                 goto finish;
         }
 
-        r = 0;
+        r = 1;
 
 finish:
         if (m)