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

[Dave Reisner]

    Date: Monday, June 9, 2014 @ 19:27:21
  Author: dreisner
Revision: 214756

upgpkg: systemd 213-8

- backport fix to ignore DM devices for udev locking (FS#40765)

Added:
  systemd/trunk/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
Modified:
  systemd/trunk/PKGBUILD
  systemd/trunk/systemd.install

-----------------------------------------------------------------+
 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch |   38 ++++++++++
 PKGBUILD                                                        |    5 +
 systemd.install                                                 |    2 
 3 files changed, 43 insertions(+), 2 deletions(-)

Added: 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch
===================================================================
--- 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch	                        (rev 0)
+++ 0001-udev-exclude-device-mapper-from-block-device-ownersh.patch	2014-06-09 17:27:21 UTC (rev 214756)
@@ -0,0 +1,38 @@
+From e918a1b5a94f270186dca59156354acd2a596494 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay at vrfy.org>
+Date: Tue, 3 Jun 2014 16:49:38 +0200
+Subject: [PATCH] udev: exclude device-mapper from block device ownership event
+ locking
+
+---
+ src/udev/udevd.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 819ea3b..6c05104 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -290,7 +290,19 @@ static void worker_new(struct event *event)
+                          * acquired the lock, the external process will block until
+                          * udev has finished its event handling.
+                          */
+-                        if (streq_ptr("block", udev_device_get_subsystem(dev))) {
++
++                        /*
++                         * <kabi_> since we make check - device seems unused - we try
++                         *         ioctl to deactivate - and device is found to be opened
++                         * <kay> sure, you try to take a write lock
++                         * <kay> if you get it udev is out
++                         * <kay> if you can't get it, udev is busy
++                         * <kabi_> we cannot deactivate openned device  (as it is in-use)
++                         * <kay> maybe we should just exclude dm from that thing entirely
++                         * <kabi_> IMHO this sounds like a good plan for this moment
++                         */
++                        if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
++                            !startswith("dm-", udev_device_get_sysname(dev))) {
+                                 struct udev_device *d = dev;
+ 
+                                 if (streq_ptr("partition", udev_device_get_devtype(d)))
+-- 
+2.0.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-09 16:30:08 UTC (rev 214755)
+++ PKGBUILD	2014-06-09 17:27:21 UTC (rev 214756)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
 pkgver=213
-pkgrel=7
+pkgrel=8
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -18,6 +18,7 @@
         'initcpio-install-udev'
         '0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch'
         '0001-fsck-disable-l-option-for-now.patch'
+        '0001-udev-exclude-device-mapper-from-block-device-ownersh.patch'
         '0001-networkd-link-intialize-mac-address.patch')
 md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
          '29245f7a240bfba66e2b1783b63b6b40'
@@ -25,6 +26,7 @@
          'bde43090d4ac0ef048e3eaee8202a407'
          '5f8ad7126970855614c7fa34b317728d'
          '888cf85a92dd28bcf80e18539fef3915'
+         'f26803dda8811196c0564f928bfe69d1'
          '3d53d3bcd85ca0b2ff9f4e79d012808d')
 
 prepare() {
@@ -33,6 +35,7 @@
   patch -Np1 <"$srcdir/0001-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch"
   patch -Np1 <"$srcdir/0001-networkd-link-intialize-mac-address.patch"
   patch -Np1 <"$srcdir/0001-fsck-disable-l-option-for-now.patch"
+  patch -Np1 <"$srcdir/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch"
 }
 
 build() {

Modified: systemd.install
===================================================================
--- systemd.install	2014-06-09 16:30:08 UTC (rev 214755)
+++ systemd.install	2014-06-09 17:27:21 UTC (rev 214756)
@@ -64,7 +64,7 @@
 
 _208_1_changes() {
   chown root:systemd-journal var/log/journal
-  chmod 2755 var/log/journal
+  chmod 2750 var/log/journal
 
   if [[ -e var/lib/backlight && ! -e var/lib/systemd/backlight ]]; then
     mv -T var/lib/backlight var/lib/systemd/backlight