emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow 'after *; before local;' to work

Browse Source
This commit is contained in:
Roy Marples 2007-11-22 11:25:08 +00:00
parent 640f315270
commit 46bb4b8f8b
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/librc-depend.c
View File

@ -89,6 +89,34 @@ void rc_deptree_free (rc_depinfo_t *deptree)
} }
librc_hidden_def(rc_deptree_free) librc_hidden_def(rc_deptree_free)
static rc_depinfo_t *get_depinfo (rc_depinfo_t *deptree, const char *service)
{
rc_depinfo_t *di;
if (! deptree || ! service)
return (NULL);
for (di = deptree; di; di = di->next)
if (strcmp (di->service, service) == 0)
return (di);
return (NULL);
}
static rc_deptype_t *get_deptype (rc_depinfo_t *depinfo, const char *type)
{
rc_deptype_t *dt;
if (! depinfo || !type)
return (NULL);
for (dt = depinfo->depends; dt; dt = dt->next)
if (strcmp (dt->type, type) == 0)
return (dt);
return (NULL);
}
rc_depinfo_t *rc_deptree_load (void) rc_depinfo_t *rc_deptree_load (void)
{ {
FILE *fp; FILE *fp;
@ -175,34 +203,6 @@ rc_depinfo_t *rc_deptree_load (void)
} }
librc_hidden_def(rc_deptree_load) librc_hidden_def(rc_deptree_load)
static rc_depinfo_t *get_depinfo (rc_depinfo_t *deptree, const char *service)
{
rc_depinfo_t *di;
if (! deptree || ! service)
return (NULL);
for (di = deptree; di; di = di->next)
if (strcmp (di->service, service) == 0)
return (di);
return (NULL);
}
static rc_deptype_t *get_deptype (rc_depinfo_t *depinfo, const char *type)
{
rc_deptype_t *dt;
if (! depinfo || !type)
return (NULL);
for (dt = depinfo->depends; dt; dt = dt->next)
if (strcmp (dt->type, type) == 0)
return (dt);
return (NULL);
}
static bool valid_service (const char *runlevel, const char *service) static bool valid_service (const char *runlevel, const char *service)
{ {
rc_service_state_t state = rc_service_state (service); rc_service_state_t state = rc_service_state (service);
@ -797,8 +797,22 @@ bool rc_deptree_update (void)
continue; continue;
rc_strlist_addsort (&deptype->services, depend); rc_strlist_addsort (&deptype->services, depend);
}
/* We need to allow `after *; before local;` to work.
* Conversely, we need to allow 'before *; after modules' also */
/* If we're before something, remove us from the after list */
if (strcmp (type, "ibefore") == 0) {
if ((dt = get_deptype (depinfo, "iafter")))
rc_strlist_delete (&dt->services, depend);
}
/* If we're after something, remove us from the before list */
if (strcmp (type, "iafter") == 0 ||
strcmp (type, "ineed") == 0 ||
strcmp (type, "iuse") == 0) {
if ((dt = get_deptype (depinfo, "ibefore")))
rc_strlist_delete (&dt->services, depend);
}
}
} }
pclose (fp); pclose (fp);
free (buffer); free (buffer);