summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-02 15:02:54 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-02 15:02:54 +0200
commit6a4e0b13473baed129522310c39f3bb70f46ed42 (patch)
tree1b328ab2da819b049913fb0e7b739beba394e25d
parent51da82a781537b275db3fbce8fab8592dd991758 (diff)
nspawn: use the corect method signature for CreateMachine()
-rw-r--r--src/machine/machined-dbus.c8
-rw-r--r--src/nspawn/nspawn.c8
2 files changed, 5 insertions, 11 deletions
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index a2e00d7102..83a45b63ba 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -42,7 +42,7 @@
#include "virt.h"
#define BUS_MANAGER_INTERFACE \
- " <interface name=\"org.freedesktop.machine1.Manager\">\n" \
+ " <interface name=\"org.freedesktop.machine1.Manager\">\n" \
" <method name=\"GetMachine\">\n" \
" <arg name=\"name\" type=\"s\" direction=\"in\"/>\n" \
" <arg name=\"machine\" type=\"o\" direction=\"out\"/>\n" \
@@ -180,12 +180,6 @@ static int bus_manager_create_machine(Manager *manager, DBusMessage *message) {
dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
return -EINVAL;
- dbus_message_iter_get_basic(&iter, &slice);
- if (!(isempty(slice) || (unit_name_is_valid(slice, false) && endswith(slice, ".slice"))) ||
- !dbus_message_iter_next(&iter) ||
- dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
- return -EINVAL;
-
dbus_message_iter_get_basic(&iter, &root_directory);
if (!(isempty(root_directory) || path_is_absolute(root_directory)))
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 913e73673a..cfd88efc9e 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1168,16 +1168,16 @@ static int register_machine(void) {
"CreateMachine",
&error,
NULL,
- "sayssuss",
+ "sayssusa(sv)",
arg_machine,
SD_BUS_APPEND_ID128(arg_uuid),
"nspawn",
"container",
(uint32_t) 0,
- strempty(arg_slice),
- strempty(arg_directory));
+ strempty(arg_directory),
+ 1, "Slice", "s", strempty(arg_slice));
if (r < 0) {
- log_error("Failed to register machine: %s", error.message);
+ log_error("Failed to register machine: %s", error.message ? error.message : strerror(-r));
return r;
}