chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: rework strappenda(), and rename it strjoina()
[elogind.git]
/
src
/
core
/
timer.c
diff --git
a/src/core/timer.c
b/src/core/timer.c
index 9155dfc81fccedad8cef9638513d60a034da4407..45744c7de57f64ac685c8d9d7d5fecac6039bef4 100644
(file)
--- a/
src/core/timer.c
+++ b/
src/core/timer.c
@@
-548,7
+548,7
@@
static int timer_start(Unit *u) {
t->result = TIMER_SUCCESS;
timer_enter_waiting(t, true);
t->result = TIMER_SUCCESS;
timer_enter_waiting(t, true);
- return
0
;
+ return
1
;
}
static int timer_stop(Unit *u) {
}
static int timer_stop(Unit *u) {
@@
-558,7
+558,7
@@
static int timer_stop(Unit *u) {
assert(t->state == TIMER_WAITING || t->state == TIMER_RUNNING || t->state == TIMER_ELAPSED);
timer_enter_dead(t, TIMER_SUCCESS);
assert(t->state == TIMER_WAITING || t->state == TIMER_RUNNING || t->state == TIMER_ELAPSED);
timer_enter_dead(t, TIMER_SUCCESS);
- return
0
;
+ return
1
;
}
static int timer_serialize(Unit *u, FILE *f, FDSet *fds) {
}
static int timer_serialize(Unit *u, FILE *f, FDSet *fds) {
@@
-748,6
+748,7
@@
const UnitVTable timer_vtable = {
"Unit\0"
"Timer\0"
"Install\0",
"Unit\0"
"Timer\0"
"Install\0",
+ .private_section = "Timer",
.init = timer_init,
.done = timer_done,
.init = timer_init,
.done = timer_done,
@@
-773,4
+774,7
@@
const UnitVTable timer_vtable = {
.bus_interface = "org.freedesktop.systemd1.Timer",
.bus_vtable = bus_timer_vtable,
.bus_interface = "org.freedesktop.systemd1.Timer",
.bus_vtable = bus_timer_vtable,
+ .bus_set_property = bus_timer_set_property,
+
+ .can_transient = true,
};
};