summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2016-09-06 12:07:00 -0400
committerjim-p <jimp@pfsense.org>2016-09-06 12:07:17 -0400
commit75d5738c5214b9178f149850bebbd2b8ff8d140d (patch)
tree0d024aab7391a75f97de28147b870e320e5bcb32
parent8c5b9920f345ff0366c310e3abd53a3654a9141b (diff)
downloadpfsense-75d5738c5214b9178f149850bebbd2b8ff8d140d.zip
pfsense-75d5738c5214b9178f149850bebbd2b8ff8d140d.tar.gz
Remove some obsolete code from globals.inc
-rw-r--r--src/etc/inc/globals.inc17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index e9d9f70..2067695 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -133,27 +133,12 @@ if (is_numeric($g["product_version_patch"]) && $g["product_version_patch"] != "0
}
if (file_exists("/etc/platform")) {
- $arch = php_uname("m");
-
- if (strstr($g['product_version'], "-RELEASE")) {
- /* This is only necessary for RELEASE */
- $arch = ($arch == "i386") ? "" : '/' . $arch;
- /* Full installs and NanoBSD use the same update directory and manifest in 2.x */
- $g['update_url']="https://updates.pfsense.org/_updaters{$arch}";
- $g['update_manifest']="https://updates.pfsense.org/manifest";
- } else {
- /* Full installs and NanoBSD use the same update directory and manifest in 2.x */
- $g['update_url']="https://snapshots.pfsense.org/FreeBSD_releng/10.1/{$arch}/pfSense_HEAD/.updaters/";
- $g['update_manifest']="https://updates.pfSense.org/manifest";
- }
-
+ $g['update_manifest']="https://updates.pfsense.org/manifest";
$g['platform'] = trim(file_get_contents("/etc/platform"));
if ($g['platform'] == "nanobsd") {
- $g['firmware_update_text']="pfSense-*.img.gz";
$g['hidebackupbeforeupgrade'] = true;
$g['default_config_backup_count'] = 5;
} else {
- $g['firmware_update_text']="pfSense-*.tgz";
$g['default_config_backup_count'] = 30;
}
} else {
OpenPOWER on IntegriCloud