picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unit: make sure the dropins we write are high-priority

This commit is contained in:
Lennart Poettering 2013-06-28 00:41:24 +02:00
parent 74c964d369
commit 241da3287d
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -28,6 +28,8 @@ Fedora 19:
Features:
* make BlockIODeviceWeight=, BlockIODeviceBandwidth= runtime settable
* split up BlockIOWeight= and BlockIODeviceWeight=
* how to reset dynamically changed attributes sanely?

4
src/core/dbus-manager.c
View File

@ -178,8 +178,8 @@
" <arg name=\"unset\" type=\"as\" direction=\"in\"/>\n" \
" <arg name=\"set\" type=\"as\" direction=\"in\"/>\n" \
" </method>\n" \
" <method name=\"ListUnitFiles\">\n" \
" <arg name=\"files\" type=\"a(ss)\" direction=\"out\"/>\n" \
" <method name=\"ListUnitFiles\">\n" \
" <arg name=\"files\" type=\"a(ss)\" direction=\"out\"/>\n" \
" </method>\n" \
" <method name=\"GetUnitFileState\">\n" \
" <arg name=\"file\" type=\"s\" direction=\"in\"/>\n" \

3
src/core/dbus-unit.c
View File

@ -783,7 +783,6 @@ int bus_unit_set_properties(Unit *u, DBusMessageIter *iter, UnitSetPropertiesMod
return -EINVAL;
dbus_message_iter_recurse(iter, &sub);
for (;;) {
DBusMessageIter sub2, sub3;
const char *name;
@ -830,7 +829,7 @@ int bus_unit_set_properties(Unit *u, DBusMessageIter *iter, UnitSetPropertiesMod
if (n > 0 && UNIT_VTABLE(u)->bus_commit_properties)
UNIT_VTABLE(u)->bus_commit_properties(u);
return 0;
return n;
}
const BusProperty bus_unit_properties[] = {

2
src/core/dbus-unit.h
View File

@ -62,7 +62,7 @@
" </method>\n" \
" <method name=\"ResetFailed\"/>\n" \
" <method name=\"SetProperties\">\n" \
" <arg name=\"runtime\" type=\"b\" direction=\"in\"/>\n" \
" <arg name=\"runtime\" type=\"b\" direction=\"in\"/>\n" \
" <arg name=\"properties\" type=\"a(sv)\" direction=\"in\"/>\n" \
" </method>\n" \
" <property name=\"Id\" type=\"s\" access=\"read\"/>\n" \

6
src/core/unit.c
View File

@ -2675,7 +2675,7 @@ static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c
if (!p)
return -ENOMEM;
q = strjoin(p, "/50-", name, ".conf", NULL);
q = strjoin(p, "/90-", name, ".conf", NULL);
if (!q) {
free(p);
return -ENOMEM;
@ -2733,9 +2733,9 @@ int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) {
r = drop_in_file(u, mode, name, &p, &q);
if (unlink(q) < 0)
r = -errno;
r = errno == ENOENT ? 0 : -errno;
else
r = 0;
r = 1;
rmdir(p);
return r;