shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 02:21:44 +03:00
Code

core: when writing drop-in files, name them directly after the property we set

Browse Source 
Mapping from "FooBar" to "foo-bar" is unnecessary and makes it hard to
handle many different properties with the same code, hence, let's just
not do it.
This commit is contained in:
Lennart Poettering 2013-07-11 21:03:06 +02:00
parent 8e7076caae
commit 665f8316f4
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/dbus-cgroup.c
View File

@ -162,7 +162,7 @@ int bus_cgroup_set_property(
dbus_message_iter_get_basic(i, &b); dbus_message_iter_get_basic(i, &b);
c->cpu_accounting = b; c->cpu_accounting = b;
unit_write_drop_in_private_section(u, mode, "cpu-accounting", b ? "CPUAccounting=yes" : "CPUAccounting=no"); unit_write_drop_in_private_section(u, mode, name, b ? "CPUAccounting=yes" : "CPUAccounting=no");
} }
return 1; return 1;
@ -185,7 +185,7 @@ int bus_cgroup_set_property(
c->cpu_shares = ul; c->cpu_shares = ul;
sprintf(buf, "CPUShares=%lu", ul); sprintf(buf, "CPUShares=%lu", ul);
unit_write_drop_in_private_section(u, mode, "cpu-shares", buf); unit_write_drop_in_private_section(u, mode, name, buf);
} }
return 1; return 1;
@ -200,7 +200,7 @@ int bus_cgroup_set_property(
dbus_message_iter_get_basic(i, &b); dbus_message_iter_get_basic(i, &b);
c->blockio_accounting = b; c->blockio_accounting = b;
unit_write_drop_in_private_section(u, mode, "block-io-accounting", b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no"); unit_write_drop_in_private_section(u, mode, name, b ? "BlockIOAccounting=yes" : "BlockIOAccounting=no");
} }
return 1; return 1;
@ -223,7 +223,7 @@ int bus_cgroup_set_property(
c->cpu_shares = ul; c->cpu_shares = ul;
sprintf(buf, "BlockIOWeight=%lu", ul); sprintf(buf, "BlockIOWeight=%lu", ul);
unit_write_drop_in_private_section(u, mode, "blockio-weight", buf); unit_write_drop_in_private_section(u, mode, name, buf);
} }
return 1; return 1;
@ -238,7 +238,7 @@ int bus_cgroup_set_property(
dbus_message_iter_get_basic(i, &b); dbus_message_iter_get_basic(i, &b);
c->memory_accounting = b; c->memory_accounting = b;
unit_write_drop_in_private_section(u, mode, "memory-accounting", b ? "MemoryAccounting=yes" : "MemoryAccounting=no"); unit_write_drop_in_private_section(u, mode, name, b ? "MemoryAccounting=yes" : "MemoryAccounting=no");
} }
return 1; return 1;
@ -257,11 +257,11 @@ int bus_cgroup_set_property(
if (streq(name, "MemoryLimit")) { if (streq(name, "MemoryLimit")) {
c->memory_limit = limit; c->memory_limit = limit;
sprintf(buf, "MemoryLimit=%" PRIu64, limit); sprintf(buf, "MemoryLimit=%" PRIu64, limit);
unit_write_drop_in_private_section(u, mode, "memory-limit", buf); unit_write_drop_in_private_section(u, mode, name, buf);
} else { } else {
c->memory_soft_limit = limit; c->memory_soft_limit = limit;
sprintf(buf, "MemorySoftLimit=%" PRIu64, limit); sprintf(buf, "MemorySoftLimit=%" PRIu64, limit);
unit_write_drop_in_private_section(u, mode, "memory-soft-limit", buf); unit_write_drop_in_private_section(u, mode, name, buf);
} }
} }
@ -285,7 +285,7 @@ int bus_cgroup_set_property(
c->device_policy = p; c->device_policy = p;
buf = strappenda("DevicePolicy=", policy); buf = strappenda("DevicePolicy=", policy);
unit_write_drop_in_private_section(u, mode, "device-policy", buf); unit_write_drop_in_private_section(u, mode, name, buf);
} }
return 1; return 1;
@ -365,7 +365,7 @@ int bus_cgroup_set_property(
fprintf(f, "DeviceAllow=%s %s%s%s\n", a->path, a->r ? "r" : "", a->w ? "w" : "", a->m ? "m" : ""); fprintf(f, "DeviceAllow=%s %s%s%s\n", a->path, a->r ? "r" : "", a->w ? "w" : "", a->m ? "m" : "");
fflush(f); fflush(f);
unit_write_drop_in_private_section(u, mode, "device-allow", buf); unit_write_drop_in_private_section(u, mode, name, buf);
} }
return 1; return 1;

2
src/core/dbus-service.c
View File

@ -276,7 +276,7 @@ static int bus_service_set_transient_property(
} }
fflush(f); fflush(f);
unit_write_drop_in_private_section(UNIT(s), mode, "exec-start", buf); unit_write_drop_in_private_section(UNIT(s), mode, name, buf);
} }
return 1; return 1;

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

@ -807,7 +807,7 @@ static int bus_unit_set_transient_property(
if (!contents) if (!contents)
return -ENOMEM; return -ENOMEM;
unit_write_drop_in(u, mode, "Description", contents); unit_write_drop_in(u, mode, name, contents);
} }
return 1; return 1;
@ -841,7 +841,7 @@ static int bus_unit_set_transient_property(
if (!contents) if (!contents)
return -ENOMEM; return -ENOMEM;
unit_write_drop_in(u, mode, "Slice", contents); unit_write_drop_in(u, mode, name, contents);
} }
return 1; return 1;