rc: kill php-cgi to deal with moved includes

This commit is contained in:
Franco Fichtner 2015-04-01 08:35:46 +02:00
parent 228eaee94b
commit 5320fc92f9
4 changed files with 12 additions and 5 deletions

View File

@ -87,7 +87,7 @@ case ${opmode} in
/usr/sbin/tcpdump -s 256 -v -S -l -n -e -ttt -i pflog0
;;
11)
/usr/local/etc/rc.restart_webgui
/usr/local/etc/rc.restart_webgui please
;;
12)
/usr/local/etc/rc.initial.firmware

View File

@ -47,7 +47,7 @@ pkg upgrade -y
echo
# restart the GUI after PHP changes have been applied
/usr/local/etc/rc.restart_webgui
/usr/local/etc/rc.restart_webgui please
echo

View File

@ -459,9 +459,8 @@ if (!$dry_run) {
echo "\n DHCPD...";
services_dhcpd_configure();
}
if($restart_webgui) {
echo "\n Restarting webConfigurator... ";
mwexec("/usr/local/etc/rc.restart_webgui");
if ($restart_webgui) {
mwexec('/usr/local/etc/rc.restart_webgui please');
}
}

View File

@ -11,6 +11,14 @@ echo "Restarting webConfigurator...";
killbyname("lighttpd");
if ($argc > 1) {
/*
* Force killing all php-cgi children as well
* to avoid hiccups with moved include files.
*/
killbyname("php-cgi");
}
while (is_process_running("lighttpd")) {
echo '.';
sleep(1);