forked from pool/systemd
7d2f8965e5
- Add upstream patches 1033-udev-really-exclude-device-mapper-from-block-device.patch 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch - Add upstream patches 1033-udev-really-exclude-device-mapper-from-block-device.patch 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch OBS-URL: https://build.opensuse.org/request/show/236796 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=666
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;
|