chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
macro: document that DECIMAL_STR_MAX contains space for the trailing NUL byte
[elogind.git]
/
src
/
machine
/
machined-dbus.c
diff --git
a/src/machine/machined-dbus.c
b/src/machine/machined-dbus.c
index 94dd128ec1d60c8520a472e4b13e5048595908e0..ac19695c92c0ed627df7c96dd3f68dbfcd622ca9 100644
(file)
--- 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;
}
goto fail;
}
- m->registered = true;
-
r = machine_start(m, NULL, error);
if (r < 0)
goto fail;
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->read_only,
image->crtime,
image->mtime,
- image->
siz
e,
+ image->
usag
e,
p);
if (r < 0)
return r;
p);
if (r < 0)
return r;
@@
-738,6
+736,8
@@
int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdat
return 0;
r = unit_name_from_dbus_path(path, &unit);
return 0;
r = unit_name_from_dbus_path(path, &unit);
+ if (r == -EINVAL) /* not for a unit */
+ return 0;
if (r < 0)
return r;
if (r < 0)
return r;