shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

units: get rid of no_requires unit flag, and make crypto disks require cryptsetup service

Browse Source
This commit is contained in:
Lennart Poettering 2010-11-15 18:26:37 +01:00
parent 99f08d14a7
commit 8c4dd542af
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptsetup-generator.c
View File

@ -163,7 +163,7 @@ static int create_disk(
to = NULL; to = NULL;
e = unit_name_escape(name); e = unit_name_escape(name);
if (asprintf(&to, "%s/dev-mapper-%s.device.wants/%s", arg_dest, e, n) < 0) { if (asprintf(&to, "%s/dev-mapper-%s.device.requires/%s", arg_dest, e, n) < 0) {
r = -ENOMEM; r = -ENOMEM;
goto fail; goto fail;
} }

1
src/device.c
View File

@ -562,7 +562,6 @@ DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState);
const UnitVTable device_vtable = { const UnitVTable device_vtable = {
.suffix = ".device", .suffix = ".device",
.no_requires = true,
.no_instances = true, .no_instances = true,
.no_snapshots = true, .no_snapshots = true,
.no_isolate = true, .no_isolate = true,

9
src/unit.c
View File

@ -1456,15 +1456,6 @@ int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_referen
if (u == other) if (u == other)
return 0; return 0;
if (UNIT_VTABLE(u)->no_requires &&
(d == UNIT_REQUIRES ||
d == UNIT_REQUIRES_OVERRIDABLE ||
d == UNIT_REQUISITE ||
d == UNIT_REQUISITE_OVERRIDABLE ||
d == UNIT_BIND_TO)) {
return -EINVAL;
}
if ((r = set_ensure_allocated(&u->meta.dependencies[d], trivial_hash_func, trivial_compare_func)) < 0) if ((r = set_ensure_allocated(&u->meta.dependencies[d], trivial_hash_func, trivial_compare_func)) < 0)
return r; return r;

5
src/unit.h
View File

@ -353,11 +353,6 @@ struct UnitVTable {
/* Can units of this type have multiple names? */ /* Can units of this type have multiple names? */
bool no_alias:1; bool no_alias:1;
/* If true units of this types can never have "Requires"
* dependencies, because state changes can only be observed,
* not triggered */
bool no_requires:1;
/* Instances make no sense for this type */ /* Instances make no sense for this type */
bool no_instances:1; bool no_instances:1;