chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: don't try to run AddMatch when connected to a private bus
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index 04ed6843935e6b719cc74c06b49463646574435a..c9abb08670d585ccdf8b97c66e1669ef8c3be6fe 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-144,6
+144,8
@@
static int service_set_main_pid(Service *s, pid_t pid) {
s->main_pid = pid;
s->main_pid_known = true;
s->main_pid = pid;
s->main_pid_known = true;
+ exec_status_start(&s->main_exec_status, pid);
+
return 0;
}
return 0;
}
@@
-455,7
+457,8
@@
static int service_load_sysv_path(Service *s, const char *path) {
s->sysv_runlevels = d;
}
s->sysv_runlevels = d;
}
- } else if (startswith_no_case(t, "description:")) {
+ } else if (startswith_no_case(t, "description:") &&
+ !u->meta.description) {
size_t k = strlen(t);
char *d;
size_t k = strlen(t);
char *d;
@@
-601,9
+604,13
@@
static int service_load_sysv_path(Service *s, const char *path) {
s->sysv_runlevels = d;
}
s->sysv_runlevels = d;
}
- } else if (startswith_no_case(t, "Description:")) {
+ } else if (startswith_no_case(t, "Description:") &&
+ !u->meta.description) {
char *d;
char *d;
+ /* We use the long description only if
+ * no short description is set. */
+
state = LSB_DESCRIPTION;
if (!(d = strdup(strstrip(t+12)))) {
state = LSB_DESCRIPTION;
if (!(d = strdup(strstrip(t+12)))) {
@@
-614,13
+621,9
@@
static int service_load_sysv_path(Service *s, const char *path) {
free(u->meta.description);
u->meta.description = d;
free(u->meta.description);
u->meta.description = d;
- } else if (startswith_no_case(t, "Short-Description:") &&
- !u->meta.description) {
+ } else if (startswith_no_case(t, "Short-Description:")) {
char *d;
char *d;
- /* We use the short description only
- * if no long description is set. */
-
state = LSB;
if (!(d = strdup(strstrip(t+18)))) {
state = LSB;
if (!(d = strdup(strstrip(t+18)))) {
@@
-2082,7
+2085,7
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
if (s->main_pid == pid) {
if (s->main_pid == pid) {
- exec_status_
fill
(&s->main_exec_status, pid, code, status);
+ exec_status_
exit
(&s->main_exec_status, pid, code, status);
s->main_pid = 0;
if (s->type != SERVICE_FORKING) {
s->main_pid = 0;
if (s->type != SERVICE_FORKING) {
@@
-2138,7
+2141,7
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
} else if (s->control_pid == pid) {
if (s->control_command)
} else if (s->control_pid == pid) {
if (s->control_command)
- exec_status_
fill
(&s->control_command->exec_status, pid, code, status);
+ exec_status_
exit
(&s->control_command->exec_status, pid, code, status);
s->control_pid = 0;
s->control_pid = 0;
@@
-2669,6
+2672,7
@@
DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess);
const UnitVTable service_vtable = {
.suffix = ".service",
const UnitVTable service_vtable = {
.suffix = ".service",
+ .show_status = true,
.init = service_init,
.done = service_done,
.init = service_init,
.done = service_done,