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

The real fix for the last commit is to uncomment some code - d'oh.

Browse Source
This commit is contained in:
Roy Marples 2008-05-12 23:33:40 +00:00
parent a89171ee9b
commit f13ea77491
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librc/librc-depend.c
View File

@ -431,12 +431,11 @@ static void visit_service(const RC_DEPTREE *deptree,
TAILQ_FOREACH(service, dt->services, entries) { TAILQ_FOREACH(service, dt->services, entries) {
if (!(di = get_depinfo(deptree, service->value))) if (!(di = get_depinfo(deptree, service->value)))
continue; continue;
provided = get_provided(di, runlevel, options); provided = get_provided(di, runlevel, options);
TAILQ_FOREACH(p, provided, entries) TAILQ_FOREACH(p, provided, entries)
if (strcmp (p->value, depinfo->service) == 0) { if (strcmp (p->value, depinfo->service) == 0) {
//visit_service (deptree, types, sorted, visited, di, visit_service (deptree, types, sorted, visited, di,
// runlevel, options | RC_DEP_TRACE); runlevel, options | RC_DEP_TRACE);
break; break;
} }
rc_stringlist_free(provided); rc_stringlist_free(provided);

14
src/rc/runscript.c
View File

@ -103,7 +103,6 @@ static RC_STRINGLIST *types_nu = NULL;
static RC_STRINGLIST *types_nua = NULL; static RC_STRINGLIST *types_nua = NULL;
static RC_STRINGLIST *types_m = NULL; static RC_STRINGLIST *types_m = NULL;
static RC_STRINGLIST *types_mua = NULL; static RC_STRINGLIST *types_mua = NULL;
static RC_STRINGLIST *types_p = NULL;
#ifdef __linux__ #ifdef __linux__
static void (*selinux_run_init_old)(void); static void (*selinux_run_init_old)(void);
@ -336,7 +335,6 @@ static void cleanup(void)
rc_stringlist_free(types_nua); rc_stringlist_free(types_nua);
rc_stringlist_free(types_m); rc_stringlist_free(types_m);
rc_stringlist_free(types_mua); rc_stringlist_free(types_mua);
rc_stringlist_free(types_p);
rc_plugin_unload(); rc_plugin_unload();
rc_deptree_free(deptree); rc_deptree_free(deptree);
@ -651,9 +649,6 @@ static void setup_types(void)
rc_stringlist_add(types_mua, "needsme"); rc_stringlist_add(types_mua, "needsme");
rc_stringlist_add(types_mua, "usesme"); rc_stringlist_add(types_mua, "usesme");
rc_stringlist_add(types_mua, "beforeme"); 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) static bool in_list(RC_STRINGLIST *list, char *string)
@ -952,15 +947,8 @@ static void svc_stop(bool deps)
if (! types_m) if (! types_m)
setup_types(); setup_types();
tmplist = rc_deptree_depends(deptree, types_p, applet_list, services = rc_deptree_depends(deptree, types_m, applet_list,
runlevel, 0);
if (!tmplist)
tmplist = rc_stringlist_new();
rc_stringlist_add(tmplist, applet);
services = rc_deptree_depends(deptree, types_m, tmplist,
runlevel, depoptions); runlevel, depoptions);
rc_stringlist_free(tmplist);
tmplist = NULL;
if (services) { if (services) {
TAILQ_FOREACH_REVERSE(svc, services, rc_stringlist, entries) { TAILQ_FOREACH_REVERSE(svc, services, rc_stringlist, entries) {
state = rc_service_state(svc->value); state = rc_service_state(svc->value);