From 6a4e0b13473baed129522310c39f3bb70f46ed42 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 2 Jul 2013 15:02:54 +0200
Subject: nspawn: use the corect method signature for CreateMachine()

---
 src/machine/machined-dbus.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/machine')

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)))
-- 
cgit v1.2.3-54-g00ecf