shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

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

Browse Source 
This reverts commit 206e7a5f7b.

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.
This commit is contained in:
Lennart Poettering 2014-12-29 20:00:01 +01:00
parent e5f5b5b9c9
commit c00a4c8f55
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/machine/machine.c
View File

@ -406,12 +406,10 @@ static int machine_stop_scope(Machine *m) {
if (!m->unit) if (!m->unit)
return 0; return 0;
if (!m->registered) { r = manager_stop_unit(m->manager, m->unit, &error, &job);
r = manager_stop_unit(m->manager, m->unit, &error, &job); if (r < 0) {
if (r < 0) { log_error("Failed to stop machine scope: %s", bus_error_message(&error, r));
log_error("Failed to stop machine scope: %s", bus_error_message(&error, r)); return r;
return r;
}
} }
free(m->scope_job); free(m->scope_job);

1
src/machine/machine.h
View File

@ -72,7 +72,6 @@ struct Machine {
bool in_gc_queue:1; bool in_gc_queue:1;
bool started:1; bool started:1;
bool registered:1;
sd_bus_message *create_message; sd_bus_message *create_message;

2
src/machine/machined-dbus.c
View File

@ -354,8 +354,6 @@ static int method_register_machine_internal(sd_bus *bus, sd_bus_message *message
goto fail; goto fail;
} }
m->registered = true;
r = machine_start(m, NULL, error); r = machine_start(m, NULL, error);
if (r < 0) if (r < 0)
goto fail; goto fail;