32 lines
884 B
Diff
32 lines
884 B
Diff
|
From 30cceac444bcc67896611154b051669225abaa93 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Franck Bui <fbui@suse.com>
|
||
|
|
Date: Thu, 6 Jul 2017 15:48:10 +0200
|
||
|
|
Subject: [PATCH] core: disable session keyring per system sevice entirely
|
||
|
|
for now
|
||
|
|
|
||
|
|
It seems that this stuff needs more thoughts...
|
||
|
|
|
||
|
|
See also:
|
||
|
|
https://github.com/systemd/systemd/pull/6286
|
||
|
|
|
||
|
|
[fbui: fixes bnc#1045886]
|
||
|
|
---
|
||
|
|
src/core/service.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/service.c b/src/core/service.c
|
||
|
|
index 74054887b..874f2be93 100644
|
||
|
|
--- a/src/core/service.c
|
||
|
|
+++ b/src/core/service.c
|
||
|
|
@@ -1341,7 +1341,6 @@ static int service_spawn(
|
||
|
|
} else
|
||
|
|
path = UNIT(s)->cgroup_path;
|
||
|
|
|
||
|
|
- exec_params.flags |= MANAGER_IS_SYSTEM(UNIT(s)->manager) ? EXEC_NEW_KEYRING : 0;
|
||
|
|
exec_params.argv = c->argv;
|
||
|
|
exec_params.environment = final_env;
|
||
|
|
exec_params.fds = fds;
|
||
|
|
--
|
||
|
|
2.13.1
|
||
|
|
|