chiark / gitweb /
service: calculate sysv startup priority only in start runlevels
authorLennart Poettering <lennart@poettering.net>
Fri, 3 Sep 2010 02:08:16 +0000 (04:08 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 3 Sep 2010 02:08:16 +0000 (04:08 +0200)
src/service.c

index 6539a24..efa5277 100644 (file)
@@ -2747,11 +2747,12 @@ static int service_enumerate(Manager *m) {
 
                                 if (de->d_name[0] == 'S')  {
 
 
                                 if (de->d_name[0] == 'S')  {
 
-                                        SERVICE(service)->sysv_start_priority =
-                                                MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
+                                        if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
+                                                SERVICE(service)->sysv_start_priority =
+                                                        MAX(a*10 + b, SERVICE(service)->sysv_start_priority);
 
 
-                                        if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT)
                                                 SERVICE(service)->sysv_enabled = true;
                                                 SERVICE(service)->sysv_enabled = true;
+                                        }
 
                                         if ((r = set_ensure_allocated(&runlevel_services[i], trivial_hash_func, trivial_compare_func)) < 0)
                                                 goto finish;
 
                                         if ((r = set_ensure_allocated(&runlevel_services[i], trivial_hash_func, trivial_compare_func)) < 0)
                                                 goto finish;