daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1abbee
From 735f6a0d81b4bbefd0cb57bbfd51f0f86e4a703e Mon Sep 17 00:00:00 2001
1abbee
From: Lennart Poettering <lennart@poettering.net>
1abbee
Date: Fri, 22 Apr 2016 17:31:40 +0200
1abbee
Subject: [PATCH] run: make --slice= work in conjunction with --scope
1abbee
1abbee
Fixes: #2991
1abbee
(cherry picked from commit 37e605f934892bf7458eecaeb01fc682e33cc2ad)
1abbee
Resolves: #1343904
1abbee
---
1abbee
 src/run/run.c | 4 ++++
1abbee
 1 file changed, 4 insertions(+)
1abbee
1abbee
diff --git a/src/run/run.c b/src/run/run.c
Pablo Greco 48fc63
index 4680342846..bbb542b65b 100644
1abbee
--- a/src/run/run.c
1abbee
+++ b/src/run/run.c
1abbee
@@ -595,6 +595,10 @@ static int transient_scope_set_properties(sd_bus_message *m) {
1abbee
         if (r < 0)
1abbee
                 return r;
1abbee
 
1abbee
+        r = transient_cgroup_set_properties(m);
1abbee
+        if (r < 0)
1abbee
+                return r;
1abbee
+
1abbee
         r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid());
1abbee
         if (r < 0)
1abbee
                 return r;