diff options
| author | Roy Marples <roy@marples.name> | 2008-05-12 23:33:40 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-05-12 23:33:40 +0000 |
| commit | f13ea774917a45476fed63a3f9c129897da20b6b (patch) | |
| tree | d13ae560fe55f90e8a60c58fda819b0f79f7b641 | |
| parent | a89171ee9b20ec7062f77dc651fa873690fb50d5 (diff) | |
| download | openrc-f13ea774917a45476fed63a3f9c129897da20b6b.tar.gz openrc-f13ea774917a45476fed63a3f9c129897da20b6b.tar.bz2 openrc-f13ea774917a45476fed63a3f9c129897da20b6b.tar.xz | |
The real fix for the last commit is to uncomment some code - d'oh.
| -rw-r--r-- | src/librc/librc-depend.c | 5 | ||||
| -rw-r--r-- | src/rc/runscript.c | 14 |
2 files changed, 3 insertions, 16 deletions
diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c index ac8245f..f372a56 100644 --- a/src/librc/librc-depend.c +++ b/src/librc/librc-depend.c @@ -431,12 +431,11 @@ static void visit_service(const RC_DEPTREE *deptree, TAILQ_FOREACH(service, dt->services, entries) { if (!(di = get_depinfo(deptree, service->value))) continue; - provided = get_provided(di, runlevel, options); TAILQ_FOREACH(p, provided, entries) if (strcmp (p->value, depinfo->service) == 0) { - //visit_service (deptree, types, sorted, visited, di, - // runlevel, options | RC_DEP_TRACE); + visit_service (deptree, types, sorted, visited, di, + runlevel, options | RC_DEP_TRACE); break; } rc_stringlist_free(provided); diff --git a/src/rc/runscript.c b/src/rc/runscript.c index edc704e..179cd0a 100644 --- a/src/rc/runscript.c +++ b/src/rc/runscript.c @@ -103,7 +103,6 @@ static RC_STRINGLIST *types_nu = NULL; static RC_STRINGLIST *types_nua = NULL; static RC_STRINGLIST *types_m = NULL; static RC_STRINGLIST *types_mua = NULL; -static RC_STRINGLIST *types_p = NULL; #ifdef __linux__ static void (*selinux_run_init_old)(void); @@ -336,7 +335,6 @@ static void cleanup(void) rc_stringlist_free(types_nua); rc_stringlist_free(types_m); rc_stringlist_free(types_mua); - rc_stringlist_free(types_p); rc_plugin_unload(); rc_deptree_free(deptree); @@ -651,9 +649,6 @@ static void setup_types(void) rc_stringlist_add(types_mua, "needsme"); rc_stringlist_add(types_mua, "usesme"); rc_stringlist_add(types_mua, "beforeme"); - - types_p = rc_stringlist_new(); - rc_stringlist_add(types_p, "iprovide"); } static bool in_list(RC_STRINGLIST *list, char *string) @@ -952,15 +947,8 @@ static void svc_stop(bool deps) if (! types_m) setup_types(); - tmplist = rc_deptree_depends(deptree, types_p, applet_list, - runlevel, 0); - if (!tmplist) - tmplist = rc_stringlist_new(); - rc_stringlist_add(tmplist, applet); - services = rc_deptree_depends(deptree, types_m, tmplist, + services = rc_deptree_depends(deptree, types_m, applet_list, runlevel, depoptions); - rc_stringlist_free(tmplist); - tmplist = NULL; if (services) { TAILQ_FOREACH_REVERSE(svc, services, rc_stringlist, entries) { state = rc_service_state(svc->value); |