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

Fix restarting services with plugins

Browse Source
This commit is contained in:
Roy Marples 2007-07-11 14:28:54 +00:00
parent 74d52e749d
commit e778dcbfb0
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/runscript.c
View File

@ -234,18 +234,16 @@ static void start_services (char **list) {
static void cleanup (void) static void cleanup (void)
{ {
if (! rc_in_plugin && prefix_locked) if (! rc_in_plugin) {
unlink (PREFIX_LOCK); if (prefix_locked)
unlink (PREFIX_LOCK);
if (hook_out) if (hook_out)
rc_plugin_run (hook_out, applet); rc_plugin_run (hook_out, applet);
rc_plugin_unload (); if (restart_services)
start_services (restart_services);
if (restart_services ) {
start_services (restart_services);
rc_strlist_free (restart_services);
} }
rc_plugin_unload ();
rc_free_deptree (deptree); rc_free_deptree (deptree);
rc_strlist_free (services); rc_strlist_free (services);
rc_strlist_free (types); rc_strlist_free (types);
@ -253,6 +251,7 @@ static void cleanup (void)
rc_strlist_free (providelist); rc_strlist_free (providelist);
rc_strlist_free (need_services); rc_strlist_free (need_services);
rc_strlist_free (use_services); rc_strlist_free (use_services);
rc_strlist_free (restart_services);
rc_strlist_free (tmplist); rc_strlist_free (tmplist);
free (ibsave); free (ibsave);
@ -716,7 +715,7 @@ static void svc_start (bool deps)
p = tmp; p = tmp;
STRLIST_FOREACH (tmplist, svc, i) { STRLIST_FOREACH (tmplist, svc, i) {
if (i > 1) { if (i > 1) {
if (i == n - 1) if (i == n)
p += snprintf (p, len, " or "); p += snprintf (p, len, " or ");
else else
p += snprintf (p, len, ", "); p += snprintf (p, len, ", ");
@ -1049,14 +1048,10 @@ int main (int argc, char **argv)
STRLIST_FOREACH (env, p, i) STRLIST_FOREACH (env, p, i)
putenv (p); putenv (p);
/* We don't free our list as that would be null in environ */ /* We don't free our list as that would be null in environ */
} }
softlevel = rc_get_runlevel (); softlevel = rc_get_runlevel ();
/* If not called from RC or another service then don't be parallel */
unsetenv ("RC_PARALLEL");
} }
setenv ("RC_ELOG", service, 1); setenv ("RC_ELOG", service, 1);