picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: use the corect method signature for CreateMachine()

Browse source
This commit is contained in:
Lennart Poettering 2013-07-02 15:02:54 +02:00
parent 51da82a781
commit 6a4e0b1347
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/machine/machined-dbus.c
View file

@ -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)))

8
src/nspawn/nspawn.c
View file

@ -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;
}