chiark / gitweb /
Revert "machined: don't force terminate registered machines"
authorLennart Poettering <lennart@poettering.net>
Mon, 29 Dec 2014 19:00:01 +0000 (20:00 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 29 Dec 2014 19:13:58 +0000 (20:13 +0100)
commitc00a4c8f55e51be98274e86beba14117e25dab9c
tree71730d8327d73dae42421127bfc5fd251aacaa6c
parente5f5b5b9c92d59ef3cb5169982cb6f436c9206fa
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.
src/machine/machine.c
src/machine/machine.h
src/machine/machined-dbus.c