naccyde / rpms / systemd

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