shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 09:56:51 +03:00
Code

sysv-generator: initialize units before use to ensure correct ordering

Browse Source 
The original loop called fix_order() on each service immediately after
loading it, but fix_order() would reference other units which were not
loaded yet.
This resulted in bogus and unnecessary orderings based on the static
start priorities.

Therefore call load_sysv() for every init script when traversing them in
enumerate_sysv(). This ensures that all units are loaded when
fix_order() is called.

Bug-Debian: https://bugs.debian.org/771118
This commit is contained in:
Michael Biebl 2014-11-28 06:04:48 +01:00
parent 6ce02c2a3a
commit 1ed0c19f81
Notes: Lennart Poettering 2015-02-12 14:02:10 +01:00 
Backport: bugfix
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sysv-generator/sysv-generator.c
View File

@ -755,6 +755,10 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
service->name = name;
service->path = fpath;
r = load_sysv(service);
if (r < 0)
continue;
r = hashmap_put(all_services, service->name, service);
if (r < 0)
return log_oom();
@ -939,10 +943,6 @@ int main(int argc, char *argv[]) {
}
HASHMAP_FOREACH(service, all_services, j) {
q = load_sysv(service);
if (q < 0)
continue;
q = fix_order(service, all_services);
if (q < 0)
continue;