mirror of
https://github.com/AuxXxilium/eudev.git
synced 2024-12-21 14:12:14 +07:00
service: always sort services from suse B runlevel before services from normal runlevels
This commit is contained in:
parent
a042efad57
commit
eeaafddcb5
@ -292,6 +292,7 @@ static int sysv_fix_order(Service *s) {
|
||||
LIST_FOREACH(units_per_type, other, s->meta.manager->units_per_type[UNIT_SERVICE]) {
|
||||
Service *t;
|
||||
UnitDependency d;
|
||||
bool special_s, special_t;
|
||||
|
||||
t = (Service*) other;
|
||||
|
||||
@ -307,7 +308,14 @@ static int sysv_fix_order(Service *s) {
|
||||
(!t->sysv_path || t->sysv_has_lsb))
|
||||
continue;
|
||||
|
||||
if (t->sysv_start_priority < s->sysv_start_priority)
|
||||
special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels);
|
||||
special_t = t->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, t->sysv_runlevels);
|
||||
|
||||
if (special_t && !special_s)
|
||||
d = UNIT_AFTER;
|
||||
else if (special_s && !special_t)
|
||||
d = UNIT_BEFORE;
|
||||
else if (t->sysv_start_priority < s->sysv_start_priority)
|
||||
d = UNIT_AFTER;
|
||||
else if (t->sysv_start_priority > s->sysv_start_priority)
|
||||
d = UNIT_BEFORE;
|
||||
|
Loading…
Reference in New Issue
Block a user