clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-17 22:22:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

unit: save description/slice of transient units to /run

Browse Source 
This is necessary so that these properties survive a daemon reload.
This commit is contained in:
Lennart Poettering
2013-07-10 23:41:03 +02:00
parent 71445ae75b
commit b9316fb0f3
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-unit.c
+15
View File
@@ -794,6 +794,7 @@ static int bus_unit_set_transient_property(
return -EINVAL;
if (mode != UNIT_CHECK) {
_cleanup_free_ char *contents = NULL;
const char *description;
dbus_message_iter_get_basic(i, &description);
@@ -801,6 +802,12 @@ static int bus_unit_set_transient_property(
r = unit_set_description(u, description);
if (r < 0)
return r;
contents = strjoin("[Unit]\nDescription=", description, "\n", NULL);
if (!contents)
return -ENOMEM;
unit_write_drop_in(u, mode, "Description", contents);
}
return 1;
@@ -818,6 +825,8 @@ static int bus_unit_set_transient_property(
if (mode != UNIT_CHECK)
unit_ref_unset(&u->slice);
} else {
_cleanup_free_ char *contents = NULL;
r = manager_load_unit(u->manager, s, NULL, error, &slice);
if (r < 0)
return r;
@@ -827,6 +836,12 @@ static int bus_unit_set_transient_property(
if (mode != UNIT_CHECK)
unit_ref_set(&u->slice, slice);
contents = strjoin("[", UNIT_VTABLE(u)->private_section, "]\nSlice=", s, NULL);
if (!contents)
return -ENOMEM;
unit_write_drop_in(u, mode, "Slice", contents);
}
return 1;
}
src/core/load-fragment-gperf.gperf.m4
+2
View File
@@ -259,6 +259,8 @@ Path.MakeDirectory, config_parse_bool, 0,
Path.DirectoryMode, config_parse_mode, 0, offsetof(Path, directory_mode)
m4_dnl
CGROUP_CONTEXT_CONFIG_ITEMS(Slice)m4_dnl
m4_dnl
CGROUP_CONTEXT_CONFIG_ITEMS(Scope)m4_dnl
m4_dnl The [Install] section is ignored here.
Install.Alias, NULL, 0, 0
Install.WantedBy, NULL, 0, 0