forked from pool/systemd
c14a1e98d3
- Disable blkrrpart for SLES12 and below - Add upstream patch 1054-udev-exclude-MD-from-block-device-ownership-event-lo.patch - Add with condition blkrrpart to be able to disable the patches 1025, 1027, 1029, 1030, 1031, 1032, 1033, 1034, 1037, and 1054 which uses the BLKRRPART ioctl for e.g. synthesize change events which may interfere with other tools like parted. - Update handle-disable_caplock-and-compose_table-and-kbd_rate.patch, handle-numlock-value-in-etc-sysconfig-keyboard.patch: read /etc/vconsole.conf after /etc/sysconfig/(keyboard,console) otherwise empty value in /etc/sysconfig/keyboard might override /etc/vconsole.conf values. - Update : 0001-journal-compress-return-early-in-uncompress_startswi.patch 0002-util-don-t-consider-tabs-special-in-string_has_cc-an.patch 0002-vconsole-setup-run-setfont-before-loadkeys.patch 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch apply-ACL-for-nvidia-device-nodes.patch keep-crypt-password-prompt.patch log-target-null-instead-kmsg.patch parse-crypttab-for-noauto-option.patch set-and-use-default-logconsole.patch: fix all warnings in code - Remove 0001-compress-fix-return-value.patch: not relevant to systemd v210 code. - Also change udev-generate-peristent-rule to udev-generate-persistent-rule OBS-URL: https://build.opensuse.org/request/show/242359 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=195
54 lines
2.8 KiB
Diff
54 lines
2.8 KiB
Diff
From 2e5b17d01347d3c3118be2b8ad63d20415dbb1f0 Mon Sep 17 00:00:00 2001
|
|
From: Kay Sievers <kay@vrfy.org>
|
|
Date: Thu, 24 Jul 2014 23:37:35 +0200
|
|
Subject: [PATCH] udev: exclude MD from block device ownership event locking
|
|
|
|
MD instantiates devices at open(). This is incomptible with the
|
|
locking logic, as the "change" event emitted when stopping a
|
|
device will bring it back.
|
|
---
|
|
src/udev/udevd.c | 23 +++++++----------------
|
|
1 file changed, 7 insertions(+), 16 deletions(-)
|
|
|
|
diff --git src/udev/udevd.c src/udev/udevd.c
|
|
index a45d324..db935d6 100644
|
|
--- src/udev/udevd.c
|
|
+++ src/udev/udevd.c
|
|
@@ -285,26 +285,17 @@ static void worker_new(struct event *event)
|
|
udev_event->exec_delay = exec_delay;
|
|
|
|
/*
|
|
- * Take a "read lock" on the device node; this establishes
|
|
+ * Take a shared lock on the device node; this establishes
|
|
* a concept of device "ownership" to serialize device
|
|
- * access. External processes holding a "write lock" will
|
|
+ * access. External processes holding an exclusive lock will
|
|
* cause udev to skip the event handling; in the case udev
|
|
- * acquired the lock, the external process will block until
|
|
+ * acquired the lock, the external process can block until
|
|
* udev has finished its event handling.
|
|
*/
|
|
-
|
|
- /*
|
|
- * <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(udev_device_get_sysname(dev), "dm-")) {
|
|
+ if (!streq_ptr(udev_device_get_action(dev), "remove") &&
|
|
+ streq_ptr("block", udev_device_get_subsystem(dev)) &&
|
|
+ !startswith(udev_device_get_sysname(dev), "dm-") &&
|
|
+ !startswith(udev_device_get_sysname(dev), "md")) {
|
|
struct udev_device *d = dev;
|
|
|
|
if (streq_ptr("partition", udev_device_get_devtype(d)))
|
|
--
|
|
1.7.9.2
|
|
|