diff options
| author | Colin Smith <colin@pfsense.org> | 2005-05-07 02:22:58 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-05-07 02:22:58 +0000 |
| commit | ad79bdf5392836e8eac2300753bbf9358d2a71c6 (patch) | |
| tree | f0721b33361695352f624b3dd09f1e24dc9aeb32 /usr/local/www/system_firmware.php | |
| parent | 22b94646c656ec1e5d21f00099c6ffcefcda5710 (diff) | |
| download | pfsense-ad79bdf5392836e8eac2300753bbf9358d2a71c6.zip pfsense-ad79bdf5392836e8eac2300753bbf9358d2a71c6.tar.gz | |
Update manual firmware update now that rc.firmware doesn't automagically reboot.
Diffstat (limited to 'usr/local/www/system_firmware.php')
| -rwxr-xr-x | usr/local/www/system_firmware.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index e9bfe1b..8a3ace9 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -93,8 +93,9 @@ if ($_POST && !file_exists($d_firmwarelock_path)) { if (!$input_errors && !file_exists($d_firmwarelock_path) && (!$sig_warning || $_POST['sig_override'])) { /* fire up the update script in the background */ touch($d_firmwarelock_path); - exec_rc_script_async("/etc/rc.firmware pfSenseupgrade {$g['tmp_path']}/firmware.tgz"); $savemsg = "The firmware is now being installed. The firewall will reboot automatically."; + exec("/etc/rc.firmware pfSenseupgradereboot {$g['tmp_path']}/firmware.tgz"); + exec("/etc/rc.reboot); } } } @@ -146,8 +147,12 @@ print_info_box($sig_warning); <tr> <td> <ul id="tabnav"> + <li class="tabact">Firmware Update</a></li> <li class="tabinact"><a href="system_firmware_check.php">Auto Update</a></li> +<<<<<<< system_firmware.php +======= <li class="tabact">Manual Update</a></li> +>>>>>>> 1.39 </ul> </td> </tr> |
