[arch-commits] Commit in systemd/trunk (2 files)

[Dave Reisner]

    Date: Saturday, May 31, 2014 @ 18:29:17
  Author: dreisner
Revision: 213924

upgpkg: systemd 213-2

- backport fix for hanging container on stop (FS#40619)

Added:
  systemd/trunk/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
Modified:
  systemd/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch |   26 ++++++++++
 PKGBUILD                                                        |   14 ++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

Added: 0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch
===================================================================
--- 0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch	                        (rev 0)
+++ 0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch	2014-05-31 16:29:17 UTC (rev 213924)
@@ -0,0 +1,26 @@
+From d8e40d62ab871a87fde421c4b246bb45bc3cbe2d Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147 at gmail.com>
+Date: Thu, 29 May 2014 01:17:25 +1000
+Subject: [PATCH] units: use KillMode=mixed for systemd-nspawn at .service
+
+This causes the container to shut down cleanly when the service is
+stopped.
+---
+ units/systemd-nspawn at .service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/systemd-nspawn at .service.in b/units/systemd-nspawn at .service.in
+index ff36e90..e373628 100644
+--- a/units/systemd-nspawn at .service.in
++++ b/units/systemd-nspawn at .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.9.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-31 15:05:40 UTC (rev 213923)
+++ PKGBUILD	2014-05-31 16:29:17 UTC (rev 213924)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -15,12 +15,20 @@
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
-        'initcpio-install-udev')
+        'initcpio-install-udev'
+        '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
          '29245f7a240bfba66e2b1783b63b6b40'
          '66cca7318e13eaf37c5b7db2efa69846'
-         'bde43090d4ac0ef048e3eaee8202a407')
+         'bde43090d4ac0ef048e3eaee8202a407'
+         '5f8ad7126970855614c7fa34b317728d')
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch"
+}
+
 build() {
   cd "$pkgname-$pkgver"