From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 29 Jun 2021 07:10:42 +0000 (+0200)
Subject: core: add default descriptions for slices
X-Git-Tag: v246.15~8
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=1524315833c2655900bce2363fad46776aca8eb2;p=systemd%2F.git

core: add default descriptions for slices

[  OK  ] Created slice system-getty.slice (Slice /system/getty).
[  OK  ] Created slice system-modprobe.slice (Slice /system/modprobe).
[  OK  ] Created slice system-sshd\x2dkeygen.slice (Slice /system/sshd-keygen).
[  OK  ] Created slice user.slice (User and Session Slice).

Before, the first three slices were shown without any description which didn't
look nice.

(cherry picked from commit 4dd21726f852010aef17e9b952b4bb1646fdf496)
(cherry picked from commit 0b0d80d96009e10ce36d683b7991829a2cfca67c)
(cherry picked from commit 3fa82957117677ec9d858bf86c203be6a39f812c)
---

diff --git a/src/core/slice.c b/src/core/slice.c
index c6884d8c3b..e16c63193b 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -189,6 +189,14 @@ static int slice_load(Unit *u) {
         if (r < 0)
                 return r;
 
+        if (!u->description) {
+                _cleanup_free_ char *tmp = NULL;
+
+                r = unit_name_to_path(u->id, &tmp);
+                if (r >= 0)  /* Failure is ignored… */
+                        u->description = strjoin("Slice ", tmp);
+        }
+
         return slice_verify(s);
 }