[arch-commits] Commit in systemd/trunk (3 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Tue Jun 10 14:49:02 UTC 2014
Date: Tuesday, June 10, 2014 @ 16:49:02
Author: dreisner
Revision: 214780
upgpkg: systemd 213-9
- backport more fixes for LVM boot issues (FS#40765)
Added:
systemd/trunk/0001-udev-always-close-lock-file-descriptor.patch
systemd/trunk/0001-udev-really-exclude-device-mapper-from-block-device-.patch
Modified:
systemd/trunk/PKGBUILD
-----------------------------------------------------------------+
0001-udev-always-close-lock-file-descriptor.patch | 48 ++++++++++
0001-udev-really-exclude-device-mapper-from-block-device-.patch | 33 ++++++
PKGBUILD | 13 ++
3 files changed, 91 insertions(+), 3 deletions(-)
Added: 0001-udev-always-close-lock-file-descriptor.patch
===================================================================
--- 0001-udev-always-close-lock-file-descriptor.patch (rev 0)
+++ 0001-udev-always-close-lock-file-descriptor.patch 2014-06-10 14:49:02 UTC (rev 214780)
@@ -0,0 +1,48 @@
+From 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay at vrfy.org>
+Date: Tue, 3 Jun 2014 10:46:51 +0200
+Subject: [PATCH] udev: always close lock file descriptor
+
+https://bugs.freedesktop.org/show_bug.cgi?id=79576
+---
+ src/udev/udevd.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 1c9488e..819ea3b 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -301,6 +301,7 @@ static void worker_new(struct event *event)
+ if (fd_lock >= 0 && flock(fd_lock, LOCK_SH|LOCK_NB) < 0) {
+ log_debug("Unable to flock(%s), skipping event handling: %m", udev_device_get_devnode(d));
+ err = -EWOULDBLOCK;
++ fd_lock = safe_close(fd_lock);
+ goto skip;
+ }
+ }
+@@ -317,8 +318,7 @@ static void worker_new(struct event *event)
+ udev_device_update_db(dev);
+ }
+
+- if (fd_lock >= 0)
+- close(fd_lock);
++ safe_close(fd_lock);
+
+ /* send processed event back to libudev listeners */
+ udev_monitor_send_device(worker_monitor, NULL, dev);
+@@ -377,10 +377,8 @@ skip:
+ }
+ out:
+ udev_device_unref(dev);
+- if (fd_signal >= 0)
+- close(fd_signal);
+- if (fd_ep >= 0)
+- close(fd_ep);
++ safe_close(fd_signal);
++ safe_close(fd_ep);
+ close(fd_inotify);
+ close(worker_watch[WRITE_END]);
+ udev_rules_unref(rules);
+--
+2.0.0
+
Added: 0001-udev-really-exclude-device-mapper-from-block-device-.patch
===================================================================
--- 0001-udev-really-exclude-device-mapper-from-block-device-.patch (rev 0)
+++ 0001-udev-really-exclude-device-mapper-from-block-device-.patch 2014-06-10 14:49:02 UTC (rev 214780)
@@ -0,0 +1,33 @@
+From 638ca89c53e2b897cfb3f627f4acbc7d09af2f4c Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 10 Jun 2014 15:51:15 +0200
+Subject: [PATCH] udev: really exclude device-mapper from block device
+ ownership event locking
+
+Arguments were wrong order, no?
+This fixes commits:
+
+e918a1b5a94f270186dca59156354acd2a596494
+3d06f4183470d42361303086ed9dedd29c0ffc1b
+---
+* dreisner: avoid second hunk of patch which doesn't apply to v213
+
+ src/udev/udevd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 0f3f3f0..160360e 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -304,7 +304,7 @@ static void worker_new(struct event *event)
+ * <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))) {
++ !startswith(udev_device_get_sysname(dev), "dm-")) {
+ struct udev_device *d = dev;
+
+ if (streq_ptr("partition", udev_device_get_devtype(d)))
+--
+2.0.0
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-10 14:45:54 UTC (rev 214779)
+++ PKGBUILD 2014-06-10 14:49:02 UTC (rev 214780)
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat')
pkgver=213
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -19,7 +19,9 @@
'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')
+ '0001-udev-always-close-lock-file-descriptor.patch'
+ '0001-networkd-link-intialize-mac-address.patch'
+ '0001-udev-really-exclude-device-mapper-from-block-device-.patch')
md5sums=('06496edcf86ddf6d8c12d72ba78e735d'
'29245f7a240bfba66e2b1783b63b6b40'
'66cca7318e13eaf37c5b7db2efa69846'
@@ -27,7 +29,9 @@
'5f8ad7126970855614c7fa34b317728d'
'888cf85a92dd28bcf80e18539fef3915'
'f26803dda8811196c0564f928bfe69d1'
- '3d53d3bcd85ca0b2ff9f4e79d012808d')
+ '2a14fe9876fa48f01cca3c1d575e5771'
+ '3d53d3bcd85ca0b2ff9f4e79d012808d'
+ 'ae060fc00eeced6554e70d9a9c0eb42f')
prepare() {
cd "$pkgname-$pkgver"
@@ -35,9 +39,12 @@
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-always-close-lock-file-descriptor.patch"
patch -Np1 <"$srcdir/0001-udev-exclude-device-mapper-from-block-device-ownersh.patch"
+ patch -Np1 <"$srcdir/0001-udev-really-exclude-device-mapper-from-block-device-.patch"
}
+
build() {
cd "$pkgname-$pkgver"
More information about the arch-commits
mailing list