Revert "machined: don't force terminate registered machines"

poettering · poettering · commit c00a4c8f55e5 · 2014-12-29T20:13:58.000+01:00
This reverts commit 206e7a5. We actually want to allow shutting down containers that use RegisterMachine() rather than CreateMachine() to register their own unit. It should be safe to do so, since the primary usecase for RegisterMachine() are container managers that run only a single container within their own unit, such as systemd-nspawn.
diff --git a/src/machine/machine.c b/src/machine/machine.c
@@ -406,12 +406,10 @@ static int machine_stop_scope(Machine *m) {
         if (!m->unit)
                 return 0;
 
-        if (!m->registered) {
-                r = manager_stop_unit(m->manager, m->unit, &error, &job);
-                if (r < 0) {
-                        log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
-                        return r;
-                }
+        r = manager_stop_unit(m->manager, m->unit, &error, &job);
+        if (r < 0) {
+                log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
+                return r;
         }
 
         free(m->scope_job);
diff --git a/src/machine/machine.h b/src/machine/machine.h
@@ -72,7 +72,6 @@ struct Machine {
 
         bool in_gc_queue:1;
         bool started:1;
-        bool registered:1;
 
         sd_bus_message *create_message;
 
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,6 @@ static int method_register_machine_internal(sd_bus bus, sd_bus_message message`
`354`	`354`	`goto fail;`
`355`	`355`	`}`
`356`	`356`
`357`		`- m->registered = true;`
`358`		`-`
`359`	`357`	`r = machine_start(m, NULL, error);`
`360`	`358`	`if (r < 0)`
`361`	`359`	`goto fail;`