forked from pool/systemd
Frederic Crozat
c0431dd9e8
description tag (bnc#727771, bnc#747931). OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=274
79 lines
3.4 KiB
Diff
79 lines
3.4 KiB
Diff
Index: systemd-44/src/service.c
|
|
===================================================================
|
|
--- systemd-44.orig/src/service.c
|
|
+++ systemd-44/src/service.c
|
|
@@ -122,6 +122,7 @@ static void service_init(Unit *u) {
|
|
#ifdef HAVE_SYSV_COMPAT
|
|
s->sysv_start_priority = -1;
|
|
s->sysv_start_priority_from_rcnd = -1;
|
|
+ s->sysv_remain_after_exit_heuristic = true;
|
|
#endif
|
|
s->socket_fd = -1;
|
|
s->guess_main_pid = true;
|
|
@@ -840,6 +841,34 @@ static int service_load_sysv_path(Servic
|
|
free(short_description);
|
|
short_description = d;
|
|
|
|
+ } else if (startswith_no_case(t, "PIDFile:")) {
|
|
+ char *fn;
|
|
+
|
|
+ state = LSB;
|
|
+
|
|
+ fn = strstrip(t+8);
|
|
+ if (!path_is_absolute(fn)) {
|
|
+ log_warning("[%s:%u] PID file not absolute. Ignoring.", path, line);
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (!(fn = strdup(fn))) {
|
|
+ r = -ENOMEM;
|
|
+ goto finish;
|
|
+ }
|
|
+
|
|
+ free(s->pid_file);
|
|
+ s->pid_file = fn;
|
|
+ s->sysv_remain_after_exit_heuristic = false;
|
|
+ s->remain_after_exit = false;
|
|
+ } else if (startswith_no_case(t, "X-Systemd-RemainAfterExit:")) {
|
|
+ char *j;
|
|
+
|
|
+ state = LSB;
|
|
+ if ((j = strstrip(t+26)) && *j) {
|
|
+ s->remain_after_exit = parse_boolean(j);
|
|
+ s->sysv_remain_after_exit_heuristic = false;
|
|
+ }
|
|
} else if (state == LSB_DESCRIPTION) {
|
|
|
|
if (startswith(l, "#\t") || startswith(l, "# ")) {
|
|
@@ -894,7 +923,8 @@ static int service_load_sysv_path(Servic
|
|
|
|
/* Special setting for all SysV services */
|
|
s->type = SERVICE_FORKING;
|
|
- s->remain_after_exit = !s->pid_file;
|
|
+ if (s->sysv_remain_after_exit_heuristic)
|
|
+ s->remain_after_exit = !s->pid_file;
|
|
s->guess_main_pid = false;
|
|
s->restart = SERVICE_RESTART_NO;
|
|
s->exec_context.ignore_sigpipe = false;
|
|
@@ -2036,7 +2066,7 @@ static void service_enter_running(Servic
|
|
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
|
|
(s->bus_name_good || s->type != SERVICE_DBUS)) {
|
|
#ifdef HAVE_SYSV_COMPAT
|
|
- if (s->sysv_enabled && !s->pid_file)
|
|
+ if (s->sysv_enabled && !s->pid_file && s->sysv_remain_after_exit_heuristic)
|
|
s->remain_after_exit = false;
|
|
#endif
|
|
service_set_state(s, SERVICE_RUNNING);
|
|
Index: systemd-44/src/service.h
|
|
===================================================================
|
|
--- systemd-44.orig/src/service.h
|
|
+++ systemd-44/src/service.h
|
|
@@ -166,6 +166,7 @@ struct Service {
|
|
#ifdef HAVE_SYSV_COMPAT
|
|
bool sysv_has_lsb:1;
|
|
bool sysv_enabled:1;
|
|
+ bool sysv_remain_after_exit_heuristic:1;
|
|
int sysv_start_priority_from_rcnd;
|
|
int sysv_start_priority;
|
|
|