8d0e9d5913
- Add upstream patches for hwdb 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch 0003-keymap-Fix-HP-Pavillon-DV7.patch 0004-hwdb-update-format-description-and-document-reloadin.patch 0008-hwdb-update.patch - Port back and add the missed upstream patches from 2014/08/22 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch 0006-login-share-VT-signal-handler-between-sessions.patch - Add upstream patches 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch 0002-switch-root-umount-the-old-root-correctly.patch 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch - man pages from section 3 are developer docs, move them to the -devel package. - Add patch 0001-let-systemctl-completion-ignore-at-names.patch to remove error messages for tab completion for systemctl isolate (bnc#892162) OBS-URL: https://build.opensuse.org/request/show/246497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=200
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 9d685ca8193c0da3ad5746be3871f5350179a3b3 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Thu, 14 Aug 2014 19:59:16 +0200
|
|
Subject: [PATCH] machine_kill(): Don't kill the unit when killing the leader
|
|
|
|
If "machinectl poweroff" or "machinectl reboot" is used on a
|
|
systemd-nspawn container started with --keep-unit and --register, it
|
|
should *only* send the appropriate signal to the leader PID (i.e. the
|
|
container's systemd process). It shouldn't fall through to
|
|
manager_kill_unit() to also send the signal to the unit. The latter
|
|
ends up killing systemd-nspawn, which takes down the container
|
|
prematurely.
|
|
---
|
|
src/machine/machine.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git src/machine/machine.c src/machine/machine.c
|
|
index 1c9177e..13d3448 100644
|
|
--- src/machine/machine.c
|
|
+++ src/machine/machine.c
|
|
@@ -493,6 +493,8 @@ int machine_kill(Machine *m, KillWho who, int signo) {
|
|
|
|
if (kill(m->leader, signo) < 0)
|
|
return -errno;
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
/* Otherwise make PID 1 do it for us, for the entire cgroup */
|
|
--
|
|
1.7.9.2
|
|
|