diff options
| author | jim-p <jimp@pfsense.org> | 2013-09-10 09:04:44 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-09-10 09:06:00 -0400 |
| commit | 408ebb78abe0a874f248d9e3eb3fec75e4186103 (patch) | |
| tree | 559e1bea4d0fafb81c76ab07e6ce67433ff67bab /etc | |
| parent | c312ee8fe59e1e12d565d41d61dd090c63ac2dca (diff) | |
| download | pfsense-408ebb78abe0a874f248d9e3eb3fec75e4186103.zip pfsense-408ebb78abe0a874f248d9e3eb3fec75e4186103.tar.gz | |
Fix update URL so the -RELEASE version looks at the stable updates URL by default rather than the snapshots server.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/globals.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 0af789d..4b9f599 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -99,17 +99,19 @@ $tcpflags = array("syn", "ack", "fin", "rst", "psh", "urg", "ece", "cwr"); if(file_exists("/etc/platform")) { $arch = php_uname("m"); + $arch = ($arch == "i386") ? "" : '/' . $arch; + + /* Full installs and NanoBSD use the same update directory and manifest in 2.x */ + $g['update_url']="http://updates.pfsense.org/_updaters{$arch}"; + $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_RELENG_2_1/.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_RELENG_2_1/.updaters/"; - $g['update_manifest']="http://updates.pfSense.com/manifest"; $g['firmware_update_text']="pfSense-*.tgz"; } } |
