X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmachine%2Fmachined-dbus.c;h=2b06d994a8f65ef5736ad852c1dd89af06de290b;hp=b894e0b44448264402de15f8a8f0f417a36ebf6e;hb=90adaa25e894a580930ef2c3e65ab8db8295515a;hpb=e5f5b5b9c92d59ef3cb5169982cb6f436c9206fa

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index b894e0b44..2b06d994a 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -354,8 +354,6 @@ static int method_register_machine_internal(sd_bus *bus, sd_bus_message *message
                 goto fail;
         }
 
-        m->registered = true;
-
         r = machine_start(m, NULL, error);
         if (r < 0)
                 goto fail;
@@ -506,7 +504,7 @@ static int method_list_images(sd_bus *bus, sd_bus_message *message, void *userda
                                           image->read_only,
                                           image->crtime,
                                           image->mtime,
-                                          image->size,
+                                          image->usage,
                                           p);
                 if (r < 0)
                         return r;
@@ -561,6 +559,27 @@ static int method_open_machine_login(sd_bus *bus, sd_bus_message *message, void
         return bus_machine_method_open_login(bus, message, machine, error);
 }
 
+static int method_bind_mount_machine(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
+        Manager *m = userdata;
+        Machine *machine;
+        const char *name;
+        int r;
+
+        assert(bus);
+        assert(message);
+        assert(m);
+
+        r = sd_bus_message_read(message, "s", &name);
+        if (r < 0)
+                return r;
+
+        machine = hashmap_get(m->machines, name);
+        if (!machine)
+                return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_MACHINE, "No machine '%s' known", name);
+
+        return bus_machine_method_bind_mount(bus, message, machine, error);
+}
+
 static int method_remove_image(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_(image_unrefp) Image* i = NULL;
         const char *name;
@@ -674,6 +693,7 @@ const sd_bus_vtable manager_vtable[] = {
         SD_BUS_METHOD("RenameImage", "ss", NULL, method_rename_image, 0),
         SD_BUS_METHOD("CloneImage", "ssb", NULL, method_clone_image, 0),
         SD_BUS_METHOD("MarkImageReadOnly", "sb", NULL, method_mark_image_read_only, 0),
+        SD_BUS_METHOD("BindMountMachine", "sssbb", NULL, method_bind_mount_machine, 0),
         SD_BUS_SIGNAL("MachineNew", "so", 0),
         SD_BUS_SIGNAL("MachineRemoved", "so", 0),
         SD_BUS_VTABLE_END