diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-12-29 20:00:01 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-12-29 20:13:58 +0100 |
| commit | c00a4c8f55e51be98274e86beba14117e25dab9c (patch) | |
| tree | 71730d8327d73dae42421127bfc5fd251aacaa6c /src/machine/machined-dbus.c | |
| parent | e5f5b5b9c92d59ef3cb5169982cb6f436c9206fa (diff) | |
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.
Diffstat (limited to 'src/machine/machined-dbus.c')
| -rw-r--r-- | src/machine/machined-dbus.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index b894e0b444..233c6e8ddb 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; |