forked from pool/systemd
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
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From 638ca89c53e2b897cfb3f627f4acbc7d09af2f4c Mon Sep 17 00:00:00 2001
|
|
From: Christian Hesse <mail@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
|
|
|
|
Signed-off-by: Robert Milasan <rmilasan@suse.com>
|
|
---
|
|
src/udev/udevd.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: systemd-210/src/udev/udevd.c
|
|
===================================================================
|
|
--- systemd-210.orig/src/udev/udevd.c
|
|
+++ systemd-210/src/udev/udevd.c
|
|
@@ -304,7 +304,7 @@ static void worker_new(struct event *eve
|
|
* <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)))
|
|
@@ -744,7 +744,7 @@ static int synthesize_change(struct udev
|
|
|
|
if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
|
|
streq_ptr("disk", udev_device_get_devtype(dev)) &&
|
|
- !startswith("dm-", udev_device_get_sysname(dev))) {
|
|
+ !startswith(udev_device_get_sysname(dev), "dm-")) {
|
|
bool part_table_read = false;
|
|
bool has_partitions = false;
|
|
int fd;
|