forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=805
This commit is contained in:
parent
a596a3655a
commit
312854cb66
@ -1,5 +1,6 @@
|
|||||||
Based on 249968612f16a71df909d6e73785c18a9ff36a65
|
Based on 249968612f16a71df909d6e73785c18a9ff36a65
|
||||||
with src/core/dbus.c as well
|
with src/core/dbus.c as well and corrected systemctl
|
||||||
|
error messages for killing a unit.
|
||||||
|
|
||||||
---
|
---
|
||||||
src/analyze/analyze.c | 2 +-
|
src/analyze/analyze.c | 2 +-
|
||||||
@ -286,7 +287,16 @@ with src/core/dbus.c as well
|
|||||||
int r;
|
int r;
|
||||||
|
|
||||||
--- src/systemctl/systemctl.c
|
--- src/systemctl/systemctl.c
|
||||||
+++ src/systemctl/systemctl.c 2014-10-21 11:22:48.516338154 +0000
|
+++ src/systemctl/systemctl.c 2014-10-22 09:36:33.399838318 +0000
|
||||||
|
@@ -2601,7 +2601,7 @@ static int kill_unit(sd_bus *bus, char *
|
||||||
|
"ssi", *names, arg_kill_who, arg_signal);
|
||||||
|
if (q < 0) {
|
||||||
|
log_error("Failed to kill unit %s: %s",
|
||||||
|
- *names, bus_error_message(&error, r));
|
||||||
|
+ *names, bus_error_message(&error, q));
|
||||||
|
if (r == 0)
|
||||||
|
r = q;
|
||||||
|
}
|
||||||
@@ -6436,7 +6436,7 @@ static int runlevel_main(void) {
|
@@ -6436,7 +6436,7 @@ static int runlevel_main(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user