67 lines
2.8 KiB
Diff
67 lines
2.8 KiB
Diff
From f69b9903a941bfeafc879fda2a2988dcfe0dc17f Mon Sep 17 00:00:00 2001
|
|
From: Franck Bui <fbui@suse.com>
|
|
Date: Thu, 21 Oct 2021 11:29:31 +0200
|
|
Subject: [PATCH 1009/1009] Drop or soften some of the deprecation warnings
|
|
|
|
- Don't taint systems using the hybrid hierarchy since it's the default on SLE.
|
|
|
|
- Reword the deprecation warning about KillMode=none (bsc#1193086)
|
|
|
|
- Decrease log level of messages about use of KillMode=none (jsc#PED-944)
|
|
|
|
[fbui: fixes bsc#1193086]
|
|
[fbui: fixes jsc#PED-944]
|
|
---
|
|
src/core/load-fragment.c | 7 +++----
|
|
src/core/manager.c | 2 +-
|
|
src/core/unit.c | 2 +-
|
|
3 files changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
|
|
index cd07f3e60d..d73adc2e00 100644
|
|
--- a/src/core/load-fragment.c
|
|
+++ b/src/core/load-fragment.c
|
|
@@ -665,11 +665,10 @@ int config_parse_kill_mode(
|
|
}
|
|
|
|
if (m == KILL_NONE)
|
|
- log_syntax(unit, LOG_WARNING, filename, line, 0,
|
|
+ log_syntax(unit, LOG_DEBUG, filename, line, 0,
|
|
"Unit configured to use KillMode=none. "
|
|
- "This is unsafe, as it disables systemd's process lifecycle management for the service. "
|
|
- "Please update your service to use a safer KillMode=, such as 'mixed' or 'control-group'. "
|
|
- "Support for KillMode=none is deprecated and will eventually be removed.");
|
|
+ "Support for KillMode=none is deprecated and will be eventually removed in future SLE versions. "
|
|
+ "Please see SUSE TID https://www.suse.com/support/kb/doc/?id=000020394 for more details.");
|
|
|
|
*k = m;
|
|
return 0;
|
|
diff --git a/src/core/manager.c b/src/core/manager.c
|
|
index 69ced2e3de..1625e76e21 100644
|
|
--- a/src/core/manager.c
|
|
+++ b/src/core/manager.c
|
|
@@ -4838,7 +4838,7 @@ char *manager_taint_string(Manager *m) {
|
|
if (access("/proc/cgroups", F_OK) < 0)
|
|
e = stpcpy(e, "cgroups-missing:");
|
|
|
|
- if (cg_all_unified() == 0)
|
|
+ if (cg_unified_controller(SYSTEMD_CGROUP_CONTROLLER) <= 0)
|
|
e = stpcpy(e, "cgroupsv1:");
|
|
|
|
if (clock_is_localtime(NULL) > 0)
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
|
index 0e8a01966a..96105a6fc1 100644
|
|
--- a/src/core/unit.c
|
|
+++ b/src/core/unit.c
|
|
@@ -5448,7 +5448,7 @@ int unit_log_leftover_process_start(pid_t pid, int sig, void *userdata) {
|
|
|
|
/* During start we print a warning */
|
|
|
|
- log_unit_warning(userdata,
|
|
+ log_unit_debug(userdata,
|
|
"Found left-over process " PID_FMT " (%s) in control group while starting unit. Ignoring.\n"
|
|
"This usually indicates unclean termination of a previous run, or service implementation deficiencies.",
|
|
pid, strna(comm));
|
|
--
|
|
2.35.3
|
|
|