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
95 lines
3.9 KiB
Diff
95 lines
3.9 KiB
Diff
From ede344452a54e1c53f541cad12a06269a4fe96a9 Mon Sep 17 00:00:00 2001
|
|
From: Kay Sievers <kay@vrfy.org>
|
|
Date: Wed, 4 Jun 2014 13:30:24 +0200
|
|
Subject: [PATCH] udev: try first re-reading the partition table
|
|
|
|
mounted partitions:
|
|
# dd if=/dev/zero of=/dev/sda bs=1 count=1
|
|
UDEV [4157.369250] change .../0:0:0:0/block/sda (block)
|
|
UDEV [4157.375059] change .../0:0:0:0/block/sda/sda1 (block)
|
|
UDEV [4157.397088] change .../0:0:0:0/block/sda/sda2 (block)
|
|
UDEV [4157.404842] change .../0:0:0:0/block/sda/sda4 (block)
|
|
|
|
unmounted partitions:
|
|
# dd if=/dev/zero of=/dev/sdb bs=1 count=1
|
|
UDEV [4163.450217] remove .../target6:0:0/6:0:0:0/block/sdb/sdb1 (block)
|
|
UDEV [4163.593167] change .../target6:0:0/6:0:0:0/block/sdb (block)
|
|
UDEV [4163.713982] add .../target6:0:0/6:0:0:0/block/sdb/sdb1 (block)
|
|
|
|
Signed-off-by: Robert Milasan <rmilasan@suse.com>
|
|
---
|
|
src/udev/udevd.c | 39 +++++++++++++++++++++++++++++++++------
|
|
1 file changed, 33 insertions(+), 6 deletions(-)
|
|
|
|
Index: systemd-210/src/udev/udevd.c
|
|
===================================================================
|
|
--- systemd-210.orig/src/udev/udevd.c
|
|
+++ systemd-210/src/udev/udevd.c
|
|
@@ -38,6 +38,7 @@
|
|
#include <sys/un.h>
|
|
#include <sys/signalfd.h>
|
|
#include <sys/epoll.h>
|
|
+#include <sys/mount.h>
|
|
#include <sys/poll.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/stat.h>
|
|
@@ -741,17 +742,37 @@ static int synthesize_change(struct udev
|
|
char filename[UTIL_PATH_SIZE];
|
|
int r;
|
|
|
|
- log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev));
|
|
- strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL);
|
|
- write_string_file(filename, "change");
|
|
-
|
|
- /* for disks devices, re-trigger all partitions too */
|
|
if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
|
|
- streq_ptr("disk", udev_device_get_devtype(dev))) {
|
|
+ streq_ptr("disk", udev_device_get_devtype(dev)) &&
|
|
+ !startswith("dm-", udev_device_get_sysname(dev))) {
|
|
+ int fd;
|
|
struct udev *udev = udev_device_get_udev(dev);
|
|
_cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL;
|
|
struct udev_list_entry *item;
|
|
|
|
+ /*
|
|
+ * Try to re-read the partition table, this only succeeds if
|
|
+ * none of the devices is busy.
|
|
+ *
|
|
+ * The kernel will send out a change event for the disk, and
|
|
+ * "remove/add" for all partitions.
|
|
+ */
|
|
+ fd = open(udev_device_get_devnode(dev), O_RDONLY|O_CLOEXEC|O_NOFOLLOW|O_NONBLOCK);
|
|
+ if (fd >= 0) {
|
|
+ r = ioctl(fd, BLKRRPART, 0);
|
|
+ close(fd);
|
|
+ if (r >= 0)
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ /*
|
|
+ * Re-reading the partition table did not work, synthesize "change"
|
|
+ * events for the disk and all partitions.
|
|
+ */
|
|
+ log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev));
|
|
+ strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL);
|
|
+ write_string_file(filename, "change");
|
|
+
|
|
e = udev_enumerate_new(udev);
|
|
if (!e)
|
|
return -ENOMEM;
|
|
@@ -780,8 +801,14 @@ static int synthesize_change(struct udev
|
|
strscpyl(filename, sizeof(filename), udev_device_get_syspath(d), "/uevent", NULL);
|
|
write_string_file(filename, "change");
|
|
}
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
+ log_debug("device %s closed, synthesising 'change'", udev_device_get_devnode(dev));
|
|
+ strscpyl(filename, sizeof(filename), udev_device_get_syspath(dev), "/uevent", NULL);
|
|
+ write_string_file(filename, "change");
|
|
+
|
|
return 0;
|
|
}
|
|
|