valeriyvdovin / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone
923a60
From bc54eb811caf738ee54867359f798dc0f4be9e7e Mon Sep 17 00:00:00 2001
923a60
From: Michal Schmidt <mschmidt@redhat.com>
923a60
Date: Thu, 16 Jul 2015 21:39:56 +0200
923a60
Subject: [PATCH] core: correct return value from reload methods
923a60
923a60
Return 1 from *_reload() methods to signify "we did something", just
923a60
like in *_start(). This causes "Reloading foo..." messages to be logged.
923a60
"Reloaded foo." messages are already logged.
923a60
923a60
(cherry picked from commit 2d018ae23b838f050516d06859f50ecb9733d44b)
923a60
923a60
Related: #1506256
923a60
---
923a60
 src/core/mount.c   | 2 +-
923a60
 src/core/service.c | 2 +-
923a60
 2 files changed, 2 insertions(+), 2 deletions(-)
923a60
923a60
diff --git a/src/core/mount.c b/src/core/mount.c
923a60
index a6d93b8691..f726d96591 100644
923a60
--- a/src/core/mount.c
923a60
+++ b/src/core/mount.c
923a60
@@ -1081,7 +1081,7 @@ static int mount_reload(Unit *u) {
923a60
         assert(m->state == MOUNT_MOUNTED);
923a60
 
923a60
         mount_enter_remounting(m);
923a60
-        return 0;
923a60
+        return 1;
923a60
 }
923a60
 
923a60
 static int mount_serialize(Unit *u, FILE *f, FDSet *fds) {
923a60
diff --git a/src/core/service.c b/src/core/service.c
923a60
index 71ec5e37c9..9622ce11ff 100644
923a60
--- a/src/core/service.c
923a60
+++ b/src/core/service.c
923a60
@@ -1939,7 +1939,7 @@ static int service_reload(Unit *u) {
923a60
         assert(s->state == SERVICE_RUNNING || s->state == SERVICE_EXITED);
923a60
 
923a60
         service_enter_reload(s);
923a60
-        return 0;
923a60
+        return 1;
923a60
 }
923a60
 
923a60
 _pure_ static bool service_can_reload(Unit *u) {