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

diff --git a/TODO b/TODO
index 9db7316596322658150cebc219dec1de79a9bf13..8a807b48f9aebc0a8eab439a580a2fdbc40d8033 100644 (file)
--- 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 840e2ffc2d2f235b61983378c298b4265db54524..3767e221354f7e8575f3a468d69eff4905b324fb 100644 (file)
--- 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)