9fc3254595
- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - Add upstream patchs 0001-core-use-correct-format-string-for-UIDs.patch 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - Add upstream patch 0001-units-order-network-online.target-after-network.targ.patch to make sure that etwork-online.target follows network.target - rules: re-enable dev_id conditionally in persistent rules (bnc#884403 and bnc#882714). Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - Add upstream patches 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch 0005-man-fix-path-in-crypttab-5.patch - Add upstream patch 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it fixes udevadm settle exit code which may had roken dracut scripts (bnc#884271 comment#18) - Temporary disable patch 1022 (bnc#884271 and bnc#882714). OBS-URL: https://build.opensuse.org/request/show/238853 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=190
27 lines
795 B
Diff
27 lines
795 B
Diff
From d8e40d62ab871a87fde421c4b246bb45bc3cbe2d Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Liu <net147@gmail.com>
|
|
Date: Thu, 29 May 2014 01:17:25 +1000
|
|
Subject: [PATCH] units: use KillMode=mixed for systemd-nspawn@.service
|
|
|
|
This causes the container to shut down cleanly when the service is
|
|
stopped.
|
|
---
|
|
units/systemd-nspawn@.service.in | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git units/systemd-nspawn@.service.in units/systemd-nspawn@.service.in
|
|
index ff36e90..e373628 100644
|
|
--- units/systemd-nspawn@.service.in
|
|
+++ units/systemd-nspawn@.service.in
|
|
@@ -11,6 +11,7 @@ Documentation=man:systemd-nspawn(1)
|
|
|
|
[Service]
|
|
ExecStart=@bindir@/systemd-nspawn --quiet --keep-unit --boot --link-journal=guest --directory=/var/lib/container/%i
|
|
+KillMode=mixed
|
|
Type=notify
|
|
|
|
[Install]
|
|
--
|
|
1.7.9.2
|
|
|