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