forked from pool/systemd
12a72bb53b
(please fwd to 13.1 too)
- Release v208:
+ logind gained support for facilitating privileged input and drm
devices access for unprivileged clients (helps Wayland /
kmscon).
+ New kernel command line luks.options= allows to specify LUKS
options, when used with luks.uuid=
+ tmpfileS.d snippets can uses specifier expansion in path names
(%m, %b, %H, %v).
+ New tmpfiles.d command "m" introduced to change
owner/group/access mode of a file/directory only if it exists.
+ MemorySoftLimit= cgroup settings is no longer supported
(underlying kernel cgroup attribute will disappear in the
future).
+ memeory.use_hierarchy cgroup attribute is enabled for all
cgroups systemd creates in memory cgroup hierarchy.
+ New filed _SYSTEMD_SLICE= is logged in journal messages related
to a slice.
+ systemd-journald will no longer adjust the group of journal
files it creates to "systemd-journal" group. Permissions and
owernship is adjusted when package is upgraded.
+ Backlight and random seed files are now stored in
/var/lib/systemd.
+ Boot time performance measurements included ACPI 5.0 FPDT
informations if available.
- Drop merged patches:
0001-cgroup-add-the-missing-setting-of-variable-s-value.patch,
0002-cgroup-correct-the-log-information.patch,
0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch,
0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch,
0005-core-cgroup-first-print-then-free.patch,
OBS-URL: https://build.opensuse.org/request/show/201848
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=448
92 lines
3.9 KiB
Diff
92 lines
3.9 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Wed, 7 Dec 2011 15:15:07 +0000
|
|
Subject: remain_after_exit initscript heuristic and add new LSB headers
|
|
|
|
Add remain_after_exit heuristic for initscripts and add LSB headers
|
|
PIDFile: and X-Systemd-RemainAfterExit to control it.
|
|
|
|
(bnc#721426) (bnc#727771)
|
|
---
|
|
src/core/service.c | 34 ++++++++++++++++++++++++++++++++--
|
|
src/core/service.h | 1 +
|
|
2 files changed, 33 insertions(+), 2 deletions(-)
|
|
|
|
Index: systemd-208/src/core/service.c
|
|
===================================================================
|
|
--- systemd-208.orig/src/core/service.c
|
|
+++ systemd-208/src/core/service.c
|
|
@@ -135,6 +135,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;
|
|
@@ -883,6 +884,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, "# ")) {
|
|
@@ -933,7 +962,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;
|
|
@@ -2080,7 +2110,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-208/src/core/service.h
|
|
===================================================================
|
|
--- systemd-208.orig/src/core/service.h
|
|
+++ systemd-208/src/core/service.h
|
|
@@ -178,6 +178,7 @@ struct Service {
|
|
bool is_sysv:1;
|
|
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;
|
|
|