chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cmdline: we actually want to parse the kernel cmdline in VMs, just not in containers
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index c74e8a009f17c313e27180039463b81e666d4d8b..7f8d005f00882f21bfcba666cc347b3b1ed8dc9d 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-286,7
+286,7
@@
static int sysv_translate_facility(const char *name, const char *filename, char
"portmap", SPECIAL_RPCBIND_TARGET,
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
"syslog", SPECIAL_SYSLOG_TARGET,
"portmap", SPECIAL_RPCBIND_TARGET,
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
"syslog", SPECIAL_SYSLOG_TARGET,
- "time", SPECIAL_
RTC_SET
_TARGET,
+ "time", SPECIAL_
TIME_SYNC
_TARGET,
/* common extensions */
"mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
/* common extensions */
"mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
@@
-406,7
+406,7
@@
static int sysv_fix_order(Service *s) {
/* FIXME: Maybe we should compare the name here lexicographically? */
/* FIXME: Maybe we should compare the name here lexicographically? */
- if (
!
(r = unit_add_dependency(UNIT(s), d, UNIT(t), true)) < 0)
+ if ((r = unit_add_dependency(UNIT(s), d, UNIT(t), true)) < 0)
return r;
}
return r;
}
@@
-1024,7
+1024,7
@@
static int fsck_fix_order(Service *s) {
else
continue;
else
continue;
- if (
!
(r = unit_add_dependency(UNIT(s), d, UNIT(t), true)) < 0)
+ if ((r = unit_add_dependency(UNIT(s), d, UNIT(t), true)) < 0)
return r;
}
return r;
}
@@
-1592,8
+1592,8
@@
static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
goto fail;
}
goto fail;
}
- memcpy(t, rfds, rn_fds);
- memcpy(t+rn_fds, cfds, cn_fds);
+ memcpy(t, rfds, rn_fds
* sizeof(int)
);
+ memcpy(t+rn_fds, cfds, cn_fds
* sizeof(int)
);
free(rfds);
free(cfds);
free(rfds);
free(cfds);
@@
-1882,6
+1882,7
@@
static void service_enter_signal(Service *s, ServiceState state, bool success) {
wait_for_exit = true;
set_free(pid_set);
wait_for_exit = true;
set_free(pid_set);
+ pid_set = NULL;
}
}
}
}