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
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 83be2c398589a3d64db5999cfd5527c5219bff46 Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
Date: Tue, 20 May 2014 12:25:16 +0200
|
|
Subject: [PATCH] udevadm-settle: fixed return code for empty queue
|
|
|
|
If the udev queue is empty and "/run/udev/queue" does not exist,
|
|
"udevadm settle" would return with EXIT_FAILURE, because the inotify on
|
|
"/run/udev/queue" would fail with ENOENT.
|
|
|
|
This patch lets "udevadm settle" exit with EXIT_SUCCESS in this case.
|
|
---
|
|
src/udev/udevadm-settle.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/udev/udevadm-settle.c src/udev/udevadm-settle.c
|
|
index 65fc35f..66fd843 100644
|
|
--- src/udev/udevadm-settle.c
|
|
+++ src/udev/udevadm-settle.c
|
|
@@ -116,7 +116,11 @@ static int adm_settle(struct udev *udev, int argc, char *argv[])
|
|
}
|
|
|
|
if (inotify_add_watch(pfd[0].fd, "/run/udev/queue" , IN_DELETE) < 0) {
|
|
- log_debug("watching /run/udev failed");
|
|
+ /* If it does not exist, we don't have to wait */
|
|
+ if (errno == ENOENT)
|
|
+ rc = EXIT_SUCCESS;
|
|
+ else
|
|
+ log_debug("watching /run/udev/queue failed");
|
|
goto out;
|
|
}
|
|
|
|
--
|
|
1.7.9.2
|
|
|