forked from pool/systemd
88094f2bbb
- Add patch log-target-null-instead-kmsg.patch from Thomas Blume to enable the kernel developers to see a clean kmsg ring buffer without any systemd/udev messages included (bnc#877021) - Add upstram patches for backlight 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch 0002-backlight-do-nothing-if-max_brightness-is-0.patch 0003-backlight-unify-error-messages.patch 0004-backlight-warn-if-kernel-exposes-backlight-device-wi.patch 0005-backlight-handle-saved-brightness-exceeding-max-brig.patch - Add upstream patches 0001-errno-make-sure-to-handle-the-3-errnos-that-are-alia.patch 0002-udev-warn-when-name_to_handle_at-is-not-implemented.patch 0003-analyze-fix-plot-with-bad-y-size.patch 0004-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch 0005-job-always-add-waiting-jobs-to-run-queue-during-cold.patch - Drop upstream-net_id-changes.patch and replace them with the correct patches from upstream and their commits: add: 1014-udev-update-net_id-comments.patch add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch - Add patch log-target-null-instead-kmsg.patch from Thomas Blume to enable the kernel developers to see a clean kmsg ring buffer without any systemd/udev messages included (bnc#877021) - Add upstram patches for backlight 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch 0002-backlight-do-nothing-if-max_brightness-is-0.patch OBS-URL: https://build.opensuse.org/request/show/233680 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=186
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
Based on 1727a595225132eb73ec134b6979d9c713b42e8c Mon Sep 17 00:00:00 2001
|
|
From: Michael Marineau <michael.marineau@coreos.com>
|
|
Date: Mon, 12 May 2014 09:26:16 +0200
|
|
Subject: [PATCH] job: always add waiting jobs to run queue during coldplug
|
|
|
|
commit 20a83d7bf was not equivalent to the original bug fix proposed by
|
|
Michal Sekletar <msekleta@redhat.com>. The committed version only added
|
|
the job to the run queue if the job had a timeout, which most jobs do
|
|
not have. Just re-ordering the code gets us the intended functionality
|
|
---
|
|
src/core/job.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- src/core/job.c
|
|
+++ src/core/job.c 2014-05-12 13:11:24.918735646 +0000
|
|
@@ -1051,15 +1051,15 @@ int job_coldplug(Job *j) {
|
|
|
|
assert(j);
|
|
|
|
+ if (j->state == JOB_WAITING)
|
|
+ job_add_to_run_queue(j);
|
|
+
|
|
if (j->begin_usec == 0 || j->unit->job_timeout == 0)
|
|
return 0;
|
|
|
|
if (j->timer_event_source)
|
|
j->timer_event_source = sd_event_source_unref(j->timer_event_source);
|
|
|
|
- if (j->state == JOB_WAITING)
|
|
- job_add_to_run_queue(j);
|
|
-
|
|
r = sd_event_add_monotonic(j->manager->event, &j->timer_event_source, j->begin_usec + j->unit->job_timeout, 0, job_dispatch_timer, j);
|
|
if (r < 0)
|
|
log_debug("Failed to restart timeout for job: %s", strerror(-r));
|