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

This reverts commit 206e7a5f7b55ac61188efd895e65ab26e478cbb2.

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
index 8dec716d719057f1d63c774369be275cdd1920f8..b2831187965e4a86e843daa56bfe08cdeec34c63 100644 (file)
--- 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
index 64accda8b1131ce07768f855f7ac18917512037f..4827ba332fa870ab22b2c09665d66fc84c42d171 100644 (file)
--- 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
index b894e0b44448264402de15f8a8f0f417a36ebf6e..233c6e8ddb8af10f006386fd179d3fa8c52d3d94 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;
         }
 
-        m->registered = true;
-
         r = machine_start(m, NULL, error);
         if (r < 0)
                 goto fail;