nspawn: set TasksMax in machined instead of nspawn
authorAlban Crequy <alban@kinvolk.io>
Tue, 24 Nov 2015 17:14:01 +0000 (18:14 +0100)
committerAlban Crequy <alban@kinvolk.io>
Fri, 4 Dec 2015 22:36:39 +0000 (23:36 +0100)
https://github.com/systemd/systemd/issues/2016

src/machine/machined-dbus.c
src/nspawn/nspawn-register.c

index 49e574b..c6b5b1e 100644 (file)
@@ -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)
index d6c0200..65ca9c7 100644 (file)
@@ -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);