From: Alban Crequy <alban@kinvolk.io>
Date: Tue, 24 Nov 2015 17:14:01 +0000 (+0100)
Subject: nspawn: set TasksMax in machined instead of nspawn
X-Git-Tag: v229~234^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b370fec2b964c9ced48379824e896f44ad02a59a;p=thirdparty%2Fsystemd.git

nspawn: set TasksMax in machined instead of nspawn

https://github.com/systemd/systemd/issues/2016
---

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 49e574b6ca8..c6b5b1ec44d 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -1325,6 +1325,10 @@ int manager_start_scope(
         if (r < 0)
                 return r;
 
+        r = sd_bus_message_append(m, "(sv)", "TasksMax", "t", 8192);
+        if (r < 0)
+                return bus_log_create_error(r);
+
         if (more_properties) {
                 r = sd_bus_message_copy(m, more_properties, true);
                 if (r < 0)
diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c
index d6c0200c0c7..65ca9c762bf 100644
--- a/src/nspawn/nspawn-register.c
+++ b/src/nspawn/nspawn-register.c
@@ -105,10 +105,6 @@ int register_machine(
                                 return bus_log_create_error(r);
                 }
 
-                r = sd_bus_message_append(m, "(sv)", "TasksMax", "t", 8192);
-                if (r < 0)
-                        return bus_log_create_error(r);
-
                 r = sd_bus_message_append(m, "(sv)", "DevicePolicy", "s", "strict");
                 if (r < 0)
                         return bus_log_create_error(r);