From a11bc49704f084ff24ef0b72ad69080ee562590f Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 5 Feb 2013 16:04:29 +0000 Subject: [PATCH] Unlink pid file before starting a new process --- etc/inc/system.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/inc/system.inc b/etc/inc/system.inc index ac10b54fe2..048d579264 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -735,11 +735,6 @@ function system_webgui_start() { if ($g['booting']) echo gettext("Starting webConfigurator..."); - /* kill any running lighttpd */ - killbypid("{$g['varrun_path']}/lighty-webConfigurator.pid"); - - sleep(1); - chdir($g['www_path']); /* defaults */ @@ -793,6 +788,13 @@ function system_webgui_start() { $crt, $key, $ca, "lighty-webConfigurator.pid", $portarg, "/usr/local/www/", "cert.pem", "ca.pem"); + /* kill any running lighttpd */ + killbypid("{$g['varrun_path']}/lighty-webConfigurator.pid"); + + sleep(1); + + @unlink("{$g['varrun_path']}/lighty-webConfigurator.pid"); + /* attempt to start lighthttpd */ $res = mwexec("/usr/local/sbin/lighttpd -f {$g['varetc_path']}/lighty-webConfigurator.conf");