s->main_pid = pid;
s->main_pid_known = true;
+ exec_status_start(&s->main_exec_status, pid);
+
return 0;
}
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;
s->sysv_runlevels = d;
}
- } else if (startswith_no_case(t, "Description:")) {
+ } else if (startswith_no_case(t, "Description:") &&
+ !u->meta.description) {
char *d;
+ /* We use the long description only if
+ * no short description is set. */
+
state = LSB_DESCRIPTION;
if (!(d = strdup(strstrip(t+12)))) {
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;
- /* We use the short description only
- * if no long description is set. */
-
state = LSB;
if (!(d = strdup(strstrip(t+18)))) {
if ((r = sysv_exec_commands(s)) < 0)
goto finish;
- if (!s->sysv_runlevels || chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) {
+ if (s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) {
/* If there a runlevels configured for this service
* but none of the standard ones, then we assume this
* is some special kind of service (which might be
* needed for early boot) and don't create any links
* to it. */
- if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0 ||
- (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
- goto finish;
+ s->meta.default_dependencies = false;
- } else
/* Don't timeout special services during boot (like fsck) */
s->timeout_usec = 0;
+ }
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
return 0;
}
+static int service_add_default_dependencies(Service *s) {
+ int r;
+
+ assert(s);
+
+ /* Add a number of automatic dependencies useful for the
+ * majority of services. */
+
+ /* First, pull in base system */
+ if (s->meta.manager->running_as == MANAGER_SYSTEM) {
+
+ if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
+ return r;
+
+ } else if (s->meta.manager->running_as == MANAGER_SESSION) {
+
+ if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
+ return r;
+ }
+
+ /* Second, activate normal shutdown */
+ return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+}
+
static int service_load(Unit *u) {
int r;
Service *s = SERVICE(u);
return r;
if ((r = unit_watch_bus_name(u, s->bus_name)) < 0)
- return r;
+ return r;
}
if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE)
s->notify_access = NOTIFY_MAIN;
+
+ if (s->type == SERVICE_DBUS || s->bus_name)
+ if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_TARGET, NULL, true)) < 0)
+ return r;
+
+ if (s->meta.default_dependencies)
+ if ((r = service_add_default_dependencies(s)) < 0)
+ return r;
}
return service_verify(s);
unit_serialize_item_format(u, f, "socket-fd", "%i", copy);
}
+ if (s->main_exec_status.pid > 0) {
+ unit_serialize_item_format(u, f, "main-exec-status-pid", "%lu", (unsigned long) s->main_exec_status.pid);
+
+ if (s->main_exec_status.start_timestamp.realtime > 0) {
+ unit_serialize_item_format(u, f, "main-exec-status-start-realtime",
+ "%llu", (unsigned long long) s->main_exec_status.start_timestamp.realtime);
+
+ unit_serialize_item_format(u, f, "main-exec-status-start-monotonic",
+ "%llu", (unsigned long long) s->main_exec_status.start_timestamp.monotonic);
+ }
+
+ if (s->main_exec_status.exit_timestamp.realtime > 0) {
+ unit_serialize_item_format(u, f, "main-exec-status-exit-realtime",
+ "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.realtime);
+ unit_serialize_item_format(u, f, "main-exec-status-exit-monotonic",
+ "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.monotonic);
+
+ unit_serialize_item_format(u, f, "main-exec-status-code", "%i", s->main_exec_status.code);
+ unit_serialize_item_format(u, f, "main-exec-status-status", "%i", s->main_exec_status.status);
+ }
+ }
+
return 0;
}
close_nointr_nofail(s->socket_fd);
s->socket_fd = fdset_remove(fds, fd);
}
+ } else if (streq(key, "main-exec-status-pid")) {
+ pid_t pid;
+
+ if ((r = parse_pid(value, &pid)) < 0)
+ log_debug("Failed to parse main-exec-status-pid value %s", value);
+ else
+ s->main_exec_status.pid = pid;
+ } else if (streq(key, "main-exec-status-code")) {
+ int i;
+
+ if ((r = safe_atoi(value, &i)) < 0)
+ log_debug("Failed to parse main-exec-status-code value %s", value);
+ else
+ s->main_exec_status.code = i;
+ } else if (streq(key, "main-exec-status-status")) {
+ int i;
+
+ if ((r = safe_atoi(value, &i)) < 0)
+ log_debug("Failed to parse main-exec-status-status value %s", value);
+ else
+ s->main_exec_status.status = i;
+ } else if (streq(key, "main-exec-status-start-realtime")) {
+ uint64_t k;
+
+ if ((r = safe_atollu(value, &k)) < 0)
+ log_debug("Failed to parse main-exec-status-start-realtime value %s", value);
+ else
+ s->main_exec_status.start_timestamp.realtime = (usec_t) k;
+ } else if (streq(key, "main-exec-status-start-monotonic")) {
+ uint64_t k;
+
+ if ((r = safe_atollu(value, &k)) < 0)
+ log_debug("Failed to parse main-exec-status-start-monotonic value %s", value);
+ else
+ s->main_exec_status.start_timestamp.monotonic = (usec_t) k;
+ } else if (streq(key, "main-exec-status-exit-realtime")) {
+ uint64_t k;
+
+ if ((r = safe_atollu(value, &k)) < 0)
+ log_debug("Failed to parse main-exec-status-exit-realtime value %s", value);
+ else
+ s->main_exec_status.exit_timestamp.realtime = (usec_t) k;
+ } else if (streq(key, "main-exec-status-exit-monotonic")) {
+ uint64_t k;
+
+ if ((r = safe_atollu(value, &k)) < 0)
+ log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value);
+ else
+ s->main_exec_status.exit_timestamp.monotonic = (usec_t) k;
} else
log_debug("Unknown serialization key '%s'", key);
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) {
} 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;
const UnitVTable service_vtable = {
.suffix = ".service",
+ .show_status = true,
.init = service_init,
.done = service_done,