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
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
Based on 3d06f4183470d42361303086ed9dedd29c0ffc1b Mon Sep 17 00:00:00 2001
|
|
From: Kay Sievers <kay@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 | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- src/udev/udevd.c
|
|
+++ src/udev/udevd.c 2014-06-03 15:34:42.778346368 +0000
|
|
@@ -301,6 +301,7 @@ static void worker_new(struct event *eve
|
|
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;
|
|
+ close_nointr_nofail(fd_lock); fd_lock = -1;
|
|
goto skip;
|
|
}
|
|
}
|
|
@@ -318,7 +319,7 @@ static void worker_new(struct event *eve
|
|
}
|
|
|
|
if (fd_lock >= 0)
|
|
- close(fd_lock);
|
|
+ close_nointr_nofail(fd_lock);
|
|
|
|
/* send processed event back to libudev listeners */
|
|
udev_monitor_send_device(worker_monitor, NULL, dev);
|
|
@@ -378,9 +379,9 @@ skip:
|
|
out:
|
|
udev_device_unref(dev);
|
|
if (fd_signal >= 0)
|
|
- close(fd_signal);
|
|
+ close_nointr_nofail(fd_signal);
|
|
if (fd_ep >= 0)
|
|
- close(fd_ep);
|
|
+ close_nointr_nofail(fd_ep);
|
|
close(fd_inotify);
|
|
close(worker_watch[WRITE_END]);
|
|
udev_rules_unref(rules);
|