diff options
| author | jim-p <jimp@pfsense.org> | 2013-09-10 09:08:18 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-09-10 09:08:18 -0400 |
| commit | 9633e5183b6892fe8e31edb3c6ae6c781184beab (patch) | |
| tree | c90753562af1adba264f239a2cc5ced17975aaa3 | |
| parent | 09d2bef30c1a47406585615c533542461fafc7d4 (diff) | |
| download | pfsense-9633e5183b6892fe8e31edb3c6ae6c781184beab.zip pfsense-9633e5183b6892fe8e31edb3c6ae6c781184beab.tar.gz | |
Simplify the update URL definition in globals.inc and add some comments to it.
| -rw-r--r-- | etc/inc/globals.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index a47e556..f391339 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -99,17 +99,20 @@ $tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg", "ece", "cwr"); if(file_exists("/etc/platform")) { $arch = php_uname("m"); + /* Do not remove this, it is not needed for the snapshots URL but is needed later for the -RELEASE/stable URLs */ + $arch = ($arch == "i386") ? "" : '/' . $arch; + + /* Full installs and NanoBSD use the same update directory and manifest in 2.x */ + $g['update_url']="http://snapshots.pfsense.org/FreeBSD_RELENG_8_3/{$arch}/pfSense_HEAD/.updaters/"; + $g['update_manifest']="http://updates.pfSense.com/manifest"; + $g['platform'] = trim(file_get_contents("/etc/platform")); if($g['platform'] == "nanobsd") { - $g['update_url']="http://snapshots.pfsense.org/FreeBSD_RELENG_8_3/{$arch}/pfSense_HEAD/.updaters/"; - $g['update_manifest']="http://updates.pfSense.com/nanobsd/manifest"; $g['firmware_update_text']="pfSense-*.img.gz"; $g['hidedownloadbackup'] = true; $g['hidebackupbeforeupgrade'] = true; } else { - $g['update_url']="http://snapshots.pfsense.org/FreeBSD_RELENG_8_3/{$arch}/pfSense_HEAD/.updaters/"; - $g['update_manifest']="http://updates.pfSense.com/manifest"; $g['firmware_update_text']="pfSense-*.tgz"; } } |
