diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2009-09-14 21:49:40 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2009-09-14 21:49:40 -0400 |
| commit | 1d333258dc840cfdfa91d4d5566a9189e0ead9fe (patch) | |
| tree | 68da71aa2427e130ff8f7d4556c07314daa86afc /usr/local/www/system_firmware_auto.php | |
| parent | 7ac5a4cb18367693e0a4c576cbcd907ee7d5ad67 (diff) | |
| download | pfsense-1d333258dc840cfdfa91d4d5566a9189e0ead9fe.zip pfsense-1d333258dc840cfdfa91d4d5566a9189e0ead9fe.tar.gz | |
Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on
Diffstat (limited to 'usr/local/www/system_firmware_auto.php')
| -rwxr-xr-x | usr/local/www/system_firmware_auto.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php index 7eeb2f6..d1310c7 100755 --- a/usr/local/www/system_firmware_auto.php +++ b/usr/local/www/system_firmware_auto.php @@ -30,6 +30,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/bin/nohup /bin/cat /sbin/sha256 + pfSense_MODULE: firmware +*/ ##|+PRIV ##|*IDENT=page-system-firmware-checkforupdate @@ -38,7 +42,6 @@ ##|*MATCH=system_firmware_auto.php* ##|-PRIV - require("guiconfig.inc"); $curcfg = $config['system']['firmware']; @@ -148,8 +151,8 @@ else if($needs_system_upgrade == true) $external_upgrade_helper_text .= "{$g['upload_path']}/latest.tgz"; -$downloaded_latest_tgz_sha256 = str_replace("\n", "", `sha256 -q {$g['upload_path']}/latest.tgz`); -$upgrade_latest_tgz_sha256 = str_replace("\n", "", `cat {$g['upload_path']}/latest.tgz.sha256 | awk '{ print $4 }'`); +$downloaded_latest_tgz_sha256 = str_replace("\n", "", `/sbin/sha256 -q {$g['upload_path']}/latest.tgz`); +$upgrade_latest_tgz_sha256 = str_replace("\n", "", `/bin/cat {$g['upload_path']}/latest.tgz.sha256 | awk '{ print $4 }'`); $sigchk = 0; @@ -193,7 +196,7 @@ if($downloaded_latest_tgz_sha256 <> $upgrade_latest_tgz_sha256) { } else { update_output_window("{$g['product_name']} is now upgrading.\\n\\nThe firewall will reboot once the operation is completed."); echo "\n<script language=\"JavaScript\">document.progressbar.style.visibility='hidden';\n</script>"; - mwexec("nohup {$external_upgrade_helper_text}"); + mwexec("/usr/bin/nohup {$external_upgrade_helper_text}"); } /* @@ -227,4 +230,4 @@ function read_body_firmware($ch, $string) { return $length; } -?> +?>
\ No newline at end of file |
