Skip to content

Commit 6c9cb50

Browse files
DaanDeMeyerbluca
authored andcommitted
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. (cherry picked from commit 1dbccd6) (cherry picked from commit 72d6e89) (cherry picked from commit 4d2506a)
1 parent 7e4223c commit 6c9cb50

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/core/dbus-cgroup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,7 @@ int bus_cgroup_set_property(
12001200
new_set = (CPUSet) {};
12011201

12021202
unit_invalidate_cgroup(u, CGROUP_MASK_CPUSET);
1203-
unit_write_settingf(u, flags, name, "%s=%s", name, setstr);
1203+
unit_write_settingf(u, flags, name, "%s=\n%s=%s", name, name, setstr);
12041204
}
12051205

12061206
return 1;

0 commit comments

Comments
 (0)