summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-04-22 22:11:14 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-04-22 22:11:14 +0000
commitff598ca2c949ff1aa9fd0015c4addc6958477936 (patch)
treedd1fd7d7a6483082e94ad46dcba3e7248093439a
parent1ddc3e2aad490b7d47272d62e41464bfc94edee0 (diff)
downloadpfsense-ff598ca2c949ff1aa9fd0015c4addc6958477936.zip
pfsense-ff598ca2c949ff1aa9fd0015c4addc6958477936.tar.gz
Use shutdown -r now when resstoring config. The RRD graphing tar process is somehow blocking!? on this operation causing the reboot to fail.
-rwxr-xr-xusr/local/www/diag_backup.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 1ff91fe..77e1d51 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -286,7 +286,12 @@ include("head.inc");
<?php
if($reboot_needed == true) {
- mwexec("/etc/rc.reboot");
+ ob_flush();
+ flush();
+ sleep(5);
+ while(file_exists("{$g['varrun_path']}/config.lock"))
+ sleep(3);
+ mwexec("/sbin/shutdown -r now");
exit;
}
OpenPOWER on IntegriCloud