summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-12-06 20:48:02 +0100
committerLennart Poettering <lennart@poettering.net>2015-12-06 20:48:02 +0100
commitc8a65ef42da42bc2584162d273b64c66d76f4dae (patch)
treedbd2e15f65974b41fa4c6a9a7b4b13970482f293
parent8eb3655cdb1910537615bb69c5ecf90dcc9d81c3 (diff)
parentb370fec2b964c9ced48379824e896f44ad02a59a (diff)
Merge pull request #2097 from kinvolk/alban/TasksMax
nspawn: set TasksMax in machined instead of nspawn
-rw-r--r--src/machine/machined-dbus.c4
-rw-r--r--src/nspawn/nspawn-register.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 49e574b6ca..c6b5b1ec44 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 d6c0200c0c..65ca9c762b 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);