morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

core/unit-printf: port to unit_get_cgroup_path_with_fallback()

Browse Source
This commit is contained in:
Mike Yuan
2025-06-04 20:30:59 +02:00
parent 23ac08115a
commit 9fe837d529
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/unit-printf.c
View File

@@ -88,14 +88,10 @@ static void bad_specifier(const Unit *u, char specifier) {
static int specifier_cgroup(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
const Unit *u = ASSERT_PTR(userdata);
CGroupRuntime *crt = unit_get_cgroup_runtime(u);
bad_specifier(u, specifier);
if (crt && crt->cgroup_path)
return strdup_to(ret, crt->cgroup_path);
return unit_default_cgroup_path(u, ret);
return unit_get_cgroup_path_with_fallback(u, ret);
}
static int specifier_cgroup_root(char specifier, const void *data, const char *root, const void *userdata, char **ret) {
@@ -112,14 +108,8 @@ static int specifier_cgroup_slice(char specifier, const void *data, const char *
bad_specifier(u, specifier);
slice = UNIT_GET_SLICE(u);
if (slice) {
CGroupRuntime *crt = unit_get_cgroup_runtime(slice);
if (crt && crt->cgroup_path)
return strdup_to(ret, crt->cgroup_path);
return unit_default_cgroup_path(slice, ret);
}
if (slice)
return unit_get_cgroup_path_with_fallback(slice, ret);
return strdup_to(ret, u->manager->cgroup_root);
}