Merge pull request #898 from poettering/machined-fix-reload

Fix for #376, plus some other fixes

1 files changed, 2 insertions, 1 deletions

diff --git a/src/machine/machine.h b/src/machine/machine.h
index bbe5217f65..0132b65a97 100644
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -67,7 +67,6 @@ struct Machine {
         char *name;
         sd_id128_t id;
 
-        MachineState state;
         MachineClass class;
 
         char *state_file;
@@ -83,6 +82,7 @@ struct Machine {
 
         bool in_gc_queue:1;
         bool started:1;
+        bool stopping:1;
 
         sd_bus_message *create_message;
 
@@ -101,6 +101,7 @@ bool machine_check_gc(Machine *m, bool drop_not_started);
 void machine_add_to_gc_queue(Machine *m);
 int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error);
 int machine_stop(Machine *m);
+int machine_finalize(Machine *m);
 int machine_save(Machine *m);
 int machine_load(Machine *m);
 int machine_kill(Machine *m, KillWho who, int signo);