File 1008-Drop-or-soften-some-of-the-deprecation-war... of Package systemd-bsc1218671

Overview Repositories Revisions Requests Users Attributes Meta

File 1008-Drop-or-soften-some-of-the-deprecation-warnings.patch of Package systemd-bsc1218671

From 0d869857a96957d5f477ceaaaa2e46a854622c0f Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
Date: Thu, 21 Oct 2021 11:29:31 +0200
Subject: [PATCH 1008/1016] Drop or soften some of the deprecation warnings

- Reword the deprecation warning about KillMode=none (bsc#1193086)

- Decrease log level of messages about use of KillMode=none (jsc#PED-944)

- Don't taint if /usr is unmerged as usr-merged won't happen on SLE15 distros.

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

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 219a84a234..1bb6d2f7ec 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -837,11 +837,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 uses KillMode=none. "
-                           "This is unsafe, as it disables systemd's process lifecycle management for the service. "
-                           "Please update the 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 versions of SLE. "
+                           "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 dd708902a5..d4a98c2543 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -4752,10 +4752,6 @@ char* manager_taint_string(const Manager *m) {
         if (m->taint_usr)
                 stage[n++] = "split-usr";
 
-        _cleanup_free_ char *usrbin = NULL;
-        if (readlink_malloc("/bin", &usrbin) < 0 || !PATH_IN_SET(usrbin, "usr/bin", "/usr/bin"))
-                stage[n++] = "unmerged-usr";
-
         if (access("/proc/cgroups", F_OK) < 0)
                 stage[n++] = "cgroups-missing";
 
diff --git a/src/core/unit.c b/src/core/unit.c
index 6792bda9d0..d7ccfcb315 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -5772,7 +5772,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

Places

File 1008-Drop-or-soften-some-of-the-deprecation-warnings.patch of Package systemd-bsc1218671

Places