Commit d87be9b0 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

nspawn: handle poweroff/reboot nicely in containers

parent cb7ec564
......@@ -49,15 +49,16 @@ Bugfixes:
Features:
* Query Paul Moore about relabelling socket fds while they are open
* log fewer journal internal messages to the kernel kmsg
* move keymaps to /usr/lib/... rather than /usr/lib/udev/...
* journald: check whether it is OK if the client can still modify delivered journal entries
* json: use yajl
* json: don't add wrapping array, just put entries on one line each
* json: add -o json-pretty in addition to -o json, make the latter output one line per entry
* json: use jensson
* json: properly serialize multiple fields with the same name per entry
* journalctl: make -l the default
......
......@@ -232,7 +232,7 @@
CAP_SETUID, CAP_SYS_ADMIN,
CAP_SYS_CHROOT, CAP_SYS_NICE,
CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
CAP_SYS_RESOURCE.</para></listitem>
CAP_SYS_RESOURCE, CAP_SYS_BOOT.</para></listitem>
</varlistentry>
<varlistentry>
......
This diff is collapsed.
......@@ -4011,7 +4011,8 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) {
assert(name);
assert(pid > 1);
if ((r = wait_for_terminate(pid, &status)) < 0) {
r = wait_for_terminate(pid, &status);
if (r < 0) {
log_warning("Failed to wait for %s: %s", name, strerror(-r));
return r;
}
......@@ -4034,7 +4035,6 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) {
log_warning("%s failed due to unknown reason.", name);
return -EPROTO;
}
_noreturn_ void freeze(void) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment