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

Fix some tests on FreeBSD.

Browse Source
This commit is contained in:
Roy Marples 2008-03-17 17:57:07 +00:00
parent c74cfabe2e
commit b9eb450696
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rc/runscript.c
View File

@ -220,7 +220,7 @@ static bool in_control()
if (sighup) if (sighup)
return false; return false;
if (! mtime_test || ! exists(mtime_test)) if (! *mtime_test || ! exists(mtime_test))
return false; return false;
if (rc_service_state(applet) & RC_SERVICE_STOPPED) if (rc_service_state(applet) & RC_SERVICE_STOPPED)
@ -840,9 +840,7 @@ static void svc_start(bool deps)
unlink_mtime_test(); unlink_mtime_test();
hook_out = RC_HOOK_SERVICE_START_OUT; hook_out = RC_HOOK_SERVICE_START_OUT;
rc_plugin_run(RC_HOOK_SERVICE_START_DONE, applet); rc_plugin_run(RC_HOOK_SERVICE_START_DONE, applet);
unlink(exclusive);
if (exclusive)
unlink(exclusive);
/* Now start any scheduled services */ /* Now start any scheduled services */
services = rc_services_scheduled(service); services = rc_services_scheduled(service);
@ -1019,8 +1017,7 @@ static void svc_stop(bool deps)
unlink_mtime_test(); unlink_mtime_test();
hook_out = RC_HOOK_SERVICE_STOP_OUT; hook_out = RC_HOOK_SERVICE_STOP_OUT;
rc_plugin_run(RC_HOOK_SERVICE_STOP_DONE, applet); rc_plugin_run(RC_HOOK_SERVICE_STOP_DONE, applet);
if (exclusive) unlink(exclusive);
unlink(exclusive);
hook_out = 0; hook_out = 0;
rc_plugin_run(RC_HOOK_SERVICE_STOP_OUT, applet); rc_plugin_run(RC_HOOK_SERVICE_STOP_OUT, applet);
} }