From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 30 Jun 2023 14:06:54 +0000 (+0200)
Subject: dbus-cgroup: Make sure we overwrite cpuset properties in drop-in
X-Git-Tag: v254-rc1~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dbccd6d342d9f8dd8d4a1617e0081b61a553ca8;p=thirdparty%2Fsystemd.git

dbus-cgroup: Make sure we overwrite cpuset properties in drop-in

The DBUS property setter overwrites the value of the property but
writes a drop-in that extends the value. Let's make sure the drop-in
overwrites the property value as well by assigning the empty string
first.
---

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 59d7a3ba71f..9ab806b22d7 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -1336,7 +1336,7 @@ int bus_cgroup_set_property(
                         new_set = (CPUSet) {};
 
                         unit_invalidate_cgroup(u, CGROUP_MASK_CPUSET);
-                        unit_write_settingf(u, flags, name, "%s=%s", name, setstr);
+                        unit_write_settingf(u, flags, name, "%s=\n%s=%s", name, name, setstr);
                 }
 
                 return 1;