chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install: implement --start option
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index f9763c838a2faab722fd6b0720579818931d31b7..6e571ea8b5e61702ceee3609311682656ddc6917 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-194,11
+194,11
@@
int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) {
if (!(m = new0(Manager, 1)))
return -ENOMEM;
if (!(m = new0(Manager, 1)))
return -ENOMEM;
- timestamp_get(&m->startup_timestamp);
+
dual_
timestamp_get(&m->startup_timestamp);
m->running_as = running_as;
m->confirm_spawn = confirm_spawn;
m->running_as = running_as;
m->confirm_spawn = confirm_spawn;
- m->name_data_slot = -1;
+ m->name_data_slot =
m->subscribed_data_slot =
-1;
m->exit_code = _MANAGER_EXIT_CODE_INVALID;
m->pin_cgroupfs_fd = -1;
m->exit_code = _MANAGER_EXIT_CODE_INVALID;
m->pin_cgroupfs_fd = -1;
@@
-1343,7
+1343,7
@@
static int transaction_add_isolate_jobs(Manager *m) {
continue;
/* No need to stop inactive jobs */
continue;
/* No need to stop inactive jobs */
- if (
unit_active_state(u) == UNIT_INACTIVE
)
+ if (
UNIT_IS_INACTIVE_OR_MAINTENANCE(unit_active_state(u))
)
continue;
/* Is there already something listed for this? */
continue;
/* Is there already something listed for this? */