chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: rename 'maintenance' state to 'failed' to avoid user confusion
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index 202557ac0ba6035097fc241598540f2c5f62de78..56c8502500f5c37e3b4667a8c560ae35c84d8531 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-251,9
+251,17
@@
static int sysv_translate_facility(const char *name, char **_r) {
"$time", SPECIAL_RTC_SET_TARGET,
/* Debian extensions */
"$time", SPECIAL_RTC_SET_TARGET,
/* Debian extensions */
+#ifdef TARGET_DEBIAN
"$mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
"$mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+#endif
"$mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
"$mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
- "$x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE
+ "$x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE,
+
+#ifdef TARGET_FEDORA
+ /* Fedora extensions, lacking the $ prefix */
+ "MTA", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
+ "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET
+#endif
};
unsigned i;
};
unsigned i;
@@
-488,7
+496,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
t[k-1] = 0;
}
t[k-1] = 0;
}
- if (!(d = str
dup(
strstrip(t+12)))) {
+ if (!(d = str
append("LSB: ",
strstrip(t+12)))) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}
@@
-571,10
+579,10
@@
static int service_load_sysv_path(Service *s, const char *path) {
else
r = unit_add_dependency_by_name_inverse(u, UNIT_AFTER, m, NULL, true);
else
r = unit_add_dependency_by_name_inverse(u, UNIT_AFTER, m, NULL, true);
- free(m);
-
if (r < 0)
if (r < 0)
- goto finish;
+ log_error("[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", path, line, m, strerror(-r));
+
+ free(m);
}
} else if (startswith_no_case(t, "Required-Start:") ||
}
} else if (startswith_no_case(t, "Required-Start:") ||
@@
-604,10
+612,11
@@
static int service_load_sysv_path(Service *s, const char *path) {
continue;
r = unit_add_dependency_by_name(u, startswith_no_case(t, "X-Start-Before:") ? UNIT_BEFORE : UNIT_AFTER, m, NULL, true);
continue;
r = unit_add_dependency_by_name(u, startswith_no_case(t, "X-Start-Before:") ? UNIT_BEFORE : UNIT_AFTER, m, NULL, true);
- free(m);
if (r < 0)
if (r < 0)
- goto finish;
+ log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", path, line, m, strerror(-r));
+
+ free(m);
}
} else if (startswith_no_case(t, "Default-Start:")) {
char *k, *d;
}
} else if (startswith_no_case(t, "Default-Start:")) {
char *k, *d;
@@
-635,7
+644,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
state = LSB_DESCRIPTION;
state = LSB_DESCRIPTION;
- if (!(d = str
dup(
strstrip(t+12)))) {
+ if (!(d = str
append("LSB: ",
strstrip(t+12)))) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}
@@
-648,7
+657,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
state = LSB;
state = LSB;
- if (!(d = str
dup(
strstrip(t+18)))) {
+ if (!(d = str
append("LSB: ",
strstrip(t+18)))) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}
@@
-706,9
+715,11
@@
static int service_load_sysv_path(Service *s, const char *path) {
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
- s->
valid_no_process
= true;
+ s->
remain_after_exit
= true;
s->restart = SERVICE_ONCE;
s->restart = SERVICE_ONCE;
- s->exec_context.std_output = s->meta.manager->sysv_console ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
+ s->exec_context.std_output =
+ (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY)
+ ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL;
s->exec_context.kill_mode = KILL_PROCESS_GROUP;
u->meta.load_state = UNIT_LOADED;
s->exec_context.kill_mode = KILL_PROCESS_GROUP;
u->meta.load_state = UNIT_LOADED;
@@
-951,14
+962,14
@@
static void service_dump(Unit *u, FILE *f, const char *prefix) {
"%sService State: %s\n"
"%sPermissionsStartOnly: %s\n"
"%sRootDirectoryStartOnly: %s\n"
"%sService State: %s\n"
"%sPermissionsStartOnly: %s\n"
"%sRootDirectoryStartOnly: %s\n"
- "%s
ValidNoProcess
: %s\n"
+ "%s
RemainAfterExit
: %s\n"
"%sType: %s\n"
"%sRestart: %s\n"
"%sNotifyAccess: %s\n",
prefix, service_state_to_string(s->state),
prefix, yes_no(s->permissions_start_only),
prefix, yes_no(s->root_directory_start_only),
"%sType: %s\n"
"%sRestart: %s\n"
"%sNotifyAccess: %s\n",
prefix, service_state_to_string(s->state),
prefix, yes_no(s->permissions_start_only),
prefix, yes_no(s->root_directory_start_only),
- prefix, yes_no(s->
valid_no_process
),
+ prefix, yes_no(s->
remain_after_exit
),
prefix, service_type_to_string(s->type),
prefix, service_restart_to_string(s->restart),
prefix, notify_access_to_string(s->notify_access));
prefix, service_type_to_string(s->type),
prefix, service_restart_to_string(s->restart),
prefix, notify_access_to_string(s->notify_access));
@@
-1669,7
+1680,7
@@
static void service_enter_running(Service *s, bool success) {
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
(s->bus_name_good || s->type != SERVICE_DBUS))
service_set_state(s, SERVICE_RUNNING);
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
(s->bus_name_good || s->type != SERVICE_DBUS))
service_set_state(s, SERVICE_RUNNING);
- else if (s->
valid_no_process
)
+ else if (s->
remain_after_exit
)
service_set_state(s, SERVICE_EXITED);
else
service_enter_stop(s, true);
service_set_state(s, SERVICE_EXITED);
else
service_enter_stop(s, true);
@@
-2261,7
+2272,10
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
assert(s);
assert(pid >= 0);
assert(s);
assert(pid >= 0);
- success = is_clean_exit(code, status);
+ if (s->sysv_path)
+ success = is_clean_exit_lsb(code, status);
+ else
+ success = is_clean_exit(code, status);
if (s->main_pid == pid) {
if (s->main_pid == pid) {
@@
-2449,6
+2463,9
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
}
}
}
}
}
}
+
+ /* Notify clients about changed exit status */
+ unit_add_to_dbus_queue(u);
}
static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
}
static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
@@
-2605,6
+2622,9
@@
static void service_notify_message(Unit *u, pid_t pid, char **tags) {
}
}
}
}
+
+ /* Notify clients about changed status or main pid */
+ unit_add_to_dbus_queue(u);
}
static int service_enumerate(Manager *m) {
}
static int service_enumerate(Manager *m) {
@@
-2939,7
+2959,9
@@
const UnitVTable service_vtable = {
.bus_name_owner_change = service_bus_name_owner_change,
.bus_query_pid_done = service_bus_query_pid_done,
.bus_name_owner_change = service_bus_name_owner_change,
.bus_query_pid_done = service_bus_query_pid_done,
+ .bus_interface = "org.freedesktop.systemd1.Service",
.bus_message_handler = bus_service_message_handler,
.bus_message_handler = bus_service_message_handler,
+ .bus_invalidating_properties = bus_service_invalidating_properties,
.enumerate = service_enumerate
};
.enumerate = service_enumerate
};