File 1009-drop-or-soften-deprecation-warnings.patch of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 1009-drop-or-soften-deprecation-warnings.patch of Package systemd (Revision 3edeba0b4d4275eb1cd205f402b48908)

Currently displaying revision 3edeba0b4d4275eb1cd205f402b48908 , Show latest

From 5bb22767857c8ddc336b5890dbf86743ae634b4d 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 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)

[fbui: fixes bsc#1193086]
---
 src/core/load-fragment.c | 5 ++---
 src/core/manager.c       | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 399a759ad0..18eeceae46 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -667,9 +667,8 @@ int config_parse_kill_mode(
         if (m == KILL_NONE)
                 log_syntax(unit, LOG_WARNING, 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 e1c35c92ca..1652555866 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)
-- 
2.31.1

Places

File 1009-drop-or-soften-deprecation-warnings.patch of Package systemd (Revision 3edeba0b4d4275eb1cd205f402b48908)

Places