chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machined: Move image discovery logic into src/shared, so that we can make use of...
[elogind.git]
/
src
/
machine
/
machine.c
diff --git
a/src/machine/machine.c
b/src/machine/machine.c
index 40189269e0157820aa4ed7d678e436c3a8cefb50..8dec716d719057f1d63c774369be275cdd1920f8 100644
(file)
--- a/
src/machine/machine.c
+++ b/
src/machine/machine.c
@@
-32,9
+32,10
@@
#include "fileio.h"
#include "special.h"
#include "unit-name.h"
#include "fileio.h"
#include "special.h"
#include "unit-name.h"
-#include "machine.h"
#include "bus-util.h"
#include "bus-error.h"
#include "bus-util.h"
#include "bus-error.h"
+#include "machine.h"
+#include "machine-dbus.h"
Machine* machine_new(Manager *manager, const char *name) {
Machine *m;
Machine* machine_new(Manager *manager, const char *name) {
Machine *m;
@@
-259,8
+260,7
@@
int machine_load(Machine *m) {
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to read %s: %m", m->state_file);
- return r;
+ return log_error_errno(r, "Failed to read %s: %m", m->state_file);
}
if (id)
}
if (id)