summaryrefslogtreecommitdiff
path: root/src/machine/machine.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-11 19:53:46 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-11 19:53:46 +0200
commit554604b3073467af75dc94fac9e2343148603289 (patch)
treec02fe3cb7b64ce3188129c2cba63c8adfec1ee8a /src/machine/machine.c
parentc14901bdebb311531fb85b02c7c6eebf6e8e4388 (diff)
machined: forward scope properties array from client to systemd
This makes nspawn's --scope= switch work again.
Diffstat (limited to 'src/machine/machine.c')
-rw-r--r--src/machine/machine.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 591a656f1e..602aa18be6 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -217,7 +217,7 @@ int machine_load(Machine *m) {
return r;
}
-static int machine_start_scope(Machine *m) {
+static int machine_start_scope(Machine *m, DBusMessageIter *iter) {
_cleanup_free_ char *description = NULL;
DBusError error;
char *job;
@@ -241,7 +241,7 @@ static int machine_start_scope(Machine *m) {
description = strappend(m->class == MACHINE_VM ? "Virtual Machine " : "Container ", m->name);
- r = manager_start_scope(m->manager, scope, m->leader, SPECIAL_MACHINE_SLICE, description, &error, &job);
+ r = manager_start_scope(m->manager, scope, m->leader, SPECIAL_MACHINE_SLICE, description, iter, &error, &job);
if (r < 0) {
log_error("Failed to start machine scope: %s", bus_error(&error, r));
dbus_error_free(&error);
@@ -262,7 +262,7 @@ static int machine_start_scope(Machine *m) {
return r;
}
-int machine_start(Machine *m) {
+int machine_start(Machine *m, DBusMessageIter *iter) {
int r;
assert(m);
@@ -271,7 +271,7 @@ int machine_start(Machine *m) {
return 0;
/* Create cgroup */
- r = machine_start_scope(m);
+ r = machine_start_scope(m, iter);
if (r < 0)
return r;