From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 29 Dec 2014 19:00:01 +0000 (+0100)
Subject: Revert "machined: don't force terminate registered machines"
X-Git-Tag: v219~759
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c00a4c8f55e51be98274e86beba14117e25dab9c;p=thirdparty%2Fsystemd.git

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 8dec716d719..b2831187965 100644
--- 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 64accda8b11..4827ba332fa 100644
--- 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 b894e0b4444..233c6e8ddb8 100644
--- 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;