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
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
Based on eec6022cf039e62233139000b9e95db943959e48 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Thu, 5 Jun 2014 13:43:30 +0200
|
|
Subject: [PATCH] sd-event: restore correct timeout behaviour
|
|
|
|
---
|
|
src/libsystemd/sd-event/sd-event.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- src/libsystemd/sd-event/sd-event.c
|
|
+++ src/libsystemd/sd-event/sd-event.c 2014-06-06 10:26:51.422235695 +0000
|
|
@@ -2047,6 +2047,7 @@ _public_ int sd_event_run(sd_event *e, u
|
|
unsigned ev_queue_max;
|
|
sd_event_source *p;
|
|
int r, i, m;
|
|
+ bool timedout;
|
|
|
|
assert_return(e, -EINVAL);
|
|
assert_return(!event_pid_changed(e), -ECHILD);
|
|
@@ -2084,6 +2085,8 @@ _public_ int sd_event_run(sd_event *e, u
|
|
goto finish;
|
|
}
|
|
|
|
+ timedout = m == 0;
|
|
+
|
|
dual_timestamp_get(&e->timestamp);
|
|
|
|
for (i = 0; i < m; i++) {
|
|
@@ -2123,7 +2126,7 @@ _public_ int sd_event_run(sd_event *e, u
|
|
|
|
p = event_next_pending(e);
|
|
if (!p) {
|
|
- r = 1;
|
|
+ r = !timedout;
|
|
goto finish;
|
|
}
|
|
|