|
 |
9ab0c5 |
From 0ee2318c1bc5f13904b8f60e3826eadfe2b7c66f Mon Sep 17 00:00:00 2001
|
|
|
9ab0c5 |
From: David Tardon <dtardon@redhat.com>
|
|
|
9ab0c5 |
Date: Thu, 4 Jul 2019 15:57:23 +0200
|
|
|
9ab0c5 |
Subject: [PATCH] return error value on failure
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
Regression from commit c0f32feb77768aa76d8c813471b3484c93bc2651 .
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
(cherry picked from commit e4a25c5d867e6ed832a077c32f3555bcd49ef8a6)
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
Resolves: #1729226
|
|
|
9ab0c5 |
---
|
|
|
9ab0c5 |
src/core/service.c | 6 +++---
|
|
|
9ab0c5 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
diff --git a/src/core/service.c b/src/core/service.c
|
|
|
9ab0c5 |
index 93e4759171..957c6f37cc 100644
|
|
|
9ab0c5 |
--- a/src/core/service.c
|
|
|
9ab0c5 |
+++ b/src/core/service.c
|
|
|
9ab0c5 |
@@ -750,9 +750,9 @@ static int service_load_pid_file(Service *s, bool may_warn) {
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
fd = chase_symlinks(s->pid_file, NULL, CHASE_OPEN|CHASE_SAFE, NULL);
|
|
|
9ab0c5 |
if (fd == -EPERM)
|
|
|
9ab0c5 |
- return log_unit_full(UNIT(s)->id, prio, "Permission denied while opening PID file or unsafe symlink chain: %s", s->pid_file);
|
|
|
9ab0c5 |
+ return log_unit_full_errno(UNIT(s)->id, prio, fd, "Permission denied while opening PID file or unsafe symlink chain: %s", s->pid_file);
|
|
|
9ab0c5 |
if (fd < 0)
|
|
|
9ab0c5 |
- return log_unit_full(UNIT(s)->id, prio, "Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
|
|
|
9ab0c5 |
+ return log_unit_full_errno(UNIT(s)->id, prio, fd, "Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
/* Let's read the PID file now that we chased it down. But we need to convert the O_PATH fd chase_symlinks() returned us into a proper fd first. */
|
|
|
9ab0c5 |
xsprintf(procfs, "/proc/self/fd/%i", fd);
|
|
|
9ab0c5 |
@@ -762,7 +762,7 @@ static int service_load_pid_file(Service *s, bool may_warn) {
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
r = parse_pid(k, &pid;;
|
|
|
9ab0c5 |
if (r < 0)
|
|
|
9ab0c5 |
- return log_unit_full(UNIT(s)->id, prio, "Failed to parse PID from file %s: %m", s->pid_file);
|
|
|
9ab0c5 |
+ return log_unit_full_errno(UNIT(s)->id, prio, r, "Failed to parse PID from file %s: %m", s->pid_file);
|
|
|
9ab0c5 |
|
|
|
9ab0c5 |
if (s->main_pid_known && pid == s->main_pid)
|
|
|
9ab0c5 |
return 0;
|