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

service: pull in sysv facility targets from the sysv units, not the other way round 

For an explanation see:

http://lists.freedesktop.org/archives/systemd-devel/2011-March/001692.html
This commit is contained in:
Lennart Poettering 2011-03-18 05:26:25 +01:00
parent a0e155d440
commit 9700edb4e8
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -25,6 +25,8 @@ F15:
* NM should pull in network.target, ntpd should pull in rtc-set.target.
* fix sysv parser to add right wants dependencies
* document default dependencies
Features:

25
src/service.c
View File

@ -655,16 +655,21 @@ static int service_load_sysv_path(Service *s, const char *path) {
if (unit_name_to_type(m) == UNIT_SERVICE)
r = unit_add_name(u, m);
else {
r = unit_add_dependency_by_name(u, UNIT_BEFORE, m, NULL, true);
if (s->sysv_enabled) {
int k;
if ((k = unit_add_dependency_by_name_inverse(u, UNIT_WANTS, m, NULL, true)) < 0)
r = k;
}
}
else
/* NB: SysV targets
* which are provided
* by a service are
* pulled in by the
* services, as an
* indication that the
* generic service is
* now available. This
* is strictly
* one-way. The
* targets do NOT pull
* in the SysV
* services! */
r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, UNIT_WANTS, m, NULL, true);
if (r < 0)
log_error("[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", path, line, m, strerror(-r));