forked from pool/systemd
.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=513
This commit is contained in:
parent
1226d02da2
commit
312032f44c
31
0145-logind-use-correct-who-enum-values-with-KillUnit.patch
Normal file
31
0145-logind-use-correct-who-enum-values-with-KillUnit.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 524147c1ef991edf4432aac51c880b363b4402df Mon Sep 17 00:00:00 2001
|
||||||
|
From: Marius Vollmer <mvollmer@redhat.com>
|
||||||
|
Date: Thu, 31 Oct 2013 15:55:07 +0200
|
||||||
|
Subject: [PATCH] logind: use correct "who" enum values with KillUnit.
|
||||||
|
|
||||||
|
---
|
||||||
|
src/login/logind-dbus.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
|
||||||
|
index bb85c7d..583d62e 100644
|
||||||
|
--- a/src/login/logind-dbus.c
|
||||||
|
+++ b/src/login/logind-dbus.c
|
||||||
|
@@ -2799,7 +2799,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
|
||||||
|
assert(manager);
|
||||||
|
assert(unit);
|
||||||
|
|
||||||
|
- w = who == KILL_LEADER ? "process" : "cgroup";
|
||||||
|
+ w = who == KILL_LEADER ? "control" : "all";
|
||||||
|
assert_cc(sizeof(signo) == sizeof(int32_t));
|
||||||
|
|
||||||
|
r = bus_method_call_with_reply(
|
||||||
|
@@ -2815,7 +2815,7 @@ int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo
|
||||||
|
DBUS_TYPE_INT32, &signo,
|
||||||
|
DBUS_TYPE_INVALID);
|
||||||
|
if (r < 0) {
|
||||||
|
- log_error("Failed to stop unit %s: %s", unit, bus_error(error, r));
|
||||||
|
+ log_error("Failed to kill unit %s: %s", unit, bus_error(error, r));
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 10 15:15:35 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Add patch 0145-logind-use-correct-who-enum-values-with-KillUnit.patch
|
||||||
|
to be able to kill sessions (bnc#860574)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 10 11:19:31 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Do not return from main shell script but simply exit (bnc#862789)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 9 18:43:38 UTC 2014 - werner@suse.de
|
Sun Feb 9 18:43:38 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
@ -271,6 +271,8 @@ Patch89: 0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch
|
|||||||
Patch90: 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
|
Patch90: 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
|
||||||
# PATCH-FIX-SUSE plymouth-quit-and-wait-for-emergency-service.patch -- Make sure that no plymouthd is locking the tty
|
# PATCH-FIX-SUSE plymouth-quit-and-wait-for-emergency-service.patch -- Make sure that no plymouthd is locking the tty
|
||||||
Patch91: plymouth-quit-and-wait-for-emergency-service.patch
|
Patch91: plymouth-quit-and-wait-for-emergency-service.patch
|
||||||
|
# PATCH-FIX-SUSE 0145-logind-use-correct-who-enum-values-with-KillUnit.patch -- Be able to kill sessions (bnc#860574)
|
||||||
|
Patch92: 0145-logind-use-correct-who-enum-values-with-KillUnit.patch
|
||||||
|
|
||||||
# udev patches
|
# udev patches
|
||||||
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
|
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
|
||||||
@ -593,6 +595,7 @@ cp %{SOURCE7} m4/
|
|||||||
%patch89 -p1
|
%patch89 -p1
|
||||||
%patch90 -p1
|
%patch90 -p1
|
||||||
%patch91 -p1
|
%patch91 -p1
|
||||||
|
%patch92 -p1
|
||||||
|
|
||||||
# udev patches
|
# udev patches
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 10 15:15:35 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
- Add patch 0145-logind-use-correct-who-enum-values-with-KillUnit.patch
|
||||||
|
to be able to kill sessions (bnc#860574)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Feb 10 11:19:31 UTC 2014 - werner@suse.de
|
Mon Feb 10 11:19:31 UTC 2014 - werner@suse.de
|
||||||
|
|
||||||
|
@ -266,6 +266,8 @@ Patch89: 0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch
|
|||||||
Patch90: 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
|
Patch90: 0001-On_s390_con3270_disable_ANSI_colour_esc.patch
|
||||||
# PATCH-FIX-SUSE plymouth-quit-and-wait-for-emergency-service.patch -- Make sure that no plymouthd is locking the tty
|
# PATCH-FIX-SUSE plymouth-quit-and-wait-for-emergency-service.patch -- Make sure that no plymouthd is locking the tty
|
||||||
Patch91: plymouth-quit-and-wait-for-emergency-service.patch
|
Patch91: plymouth-quit-and-wait-for-emergency-service.patch
|
||||||
|
# PATCH-FIX-SUSE 0145-logind-use-correct-who-enum-values-with-KillUnit.patch -- Be able to kill sessions (bnc#860574)
|
||||||
|
Patch92: 0145-logind-use-correct-who-enum-values-with-KillUnit.patch
|
||||||
|
|
||||||
# udev patches
|
# udev patches
|
||||||
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
|
# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch
|
||||||
@ -588,6 +590,7 @@ cp %{SOURCE7} m4/
|
|||||||
%patch89 -p1
|
%patch89 -p1
|
||||||
%patch90 -p1
|
%patch90 -p1
|
||||||
%patch91 -p1
|
%patch91 -p1
|
||||||
|
%patch92 -p1
|
||||||
|
|
||||||
# udev patches
|
# udev patches
|
||||||
%patch1001 -p1
|
%patch1001 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user