forked from pool/systemd
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
|
From 9ac441c0f40a10a6c498398e5876a5256b833e31 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
|
||
|
|
Date: Fri, 21 Feb 2014 11:20:24 +0100
|
||
|
|
Subject: [PATCH] sd-event: Fix systemd crash when using timer units.
|
||
|
|
|
||
|
|
There was a copy-paste error introduced in commit c2ba3ad6604ef2e189d7e0a36d6911116e84d3ab
|
||
|
|
which causes the following error when using timer units:
|
||
|
|
|
||
|
|
Assertion '(x->type == SOURCE_MONOTONIC && y->type == SOURCE_MONOTONIC) || (x->type == SOURCE_REALTIME && y->type == SOURCE_REALTIME)'
|
||
|
|
failed at src/libsystemd/sd-event/sd-event.c:264, function latest_time_prioq_compare(). Aborting.
|
||
|
|
---
|
||
|
|
src/libsystemd/sd-event/sd-event.c | 2 +-
|
||
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
||
|
|
|
||
|
|
diff --git src/libsystemd/sd-event/sd-event.c src/libsystemd/sd-event/sd-event.c
|
||
|
|
index 25dfd17..1f039bc 100644
|
||
|
|
--- src/libsystemd/sd-event/sd-event.c
|
||
|
|
+++ src/libsystemd/sd-event/sd-event.c
|
||
|
|
@@ -771,7 +771,7 @@ _public_ int sd_event_add_realtime(sd_event *e,
|
||
|
|
sd_event_time_handler_t callback,
|
||
|
|
void *userdata) {
|
||
|
|
|
||
|
|
- return event_add_time_internal(e, ret, SOURCE_REALTIME, &e->realtime_fd, CLOCK_REALTIME, &e->realtime_earliest, &e->monotonic_latest, usec, accuracy, callback, userdata);
|
||
|
|
+ return event_add_time_internal(e, ret, SOURCE_REALTIME, &e->realtime_fd, CLOCK_REALTIME, &e->realtime_earliest, &e->realtime_latest, usec, accuracy, callback, userdata);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int event_update_signal_fd(sd_event *e) {
|
||
|
|
--
|
||
|
|
1.7.7
|
||
|
|
|