[systemd-commits] src/sysv-generator

[Michael Biebl]

 src/sysv-generator/sysv-generator.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1ed0c19f81fd13cdf283c6def0168ce122a853a9
Author: Michael Biebl <biebl at debian.org>
Date:   Fri Nov 28 06:04:48 2014 +0100

    sysv-generator: initialize units before use to ensure correct ordering
    
    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

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index f78ddeb..2f24ef2 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -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;