summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Smith <colin@pfsense.org>2005-03-16 00:32:43 +0000
committerColin Smith <colin@pfsense.org>2005-03-16 00:32:43 +0000
commit3e304594bdfa7ec6d6c7b07fa04d5b89184f087e (patch)
tree655c7eef40170b14818aa050d541d5b93d22f4be
parenta6345863a40097426ffa90d3fd96ab6b4d163ff0 (diff)
downloadpfsense-3e304594bdfa7ec6d6c7b07fa04d5b89184f087e.zip
pfsense-3e304594bdfa7ec6d6c7b07fa04d5b89184f087e.tar.gz
*** empty log message ***
-rwxr-xr-xusr/local/www/pkg_edit.php2
-rwxr-xr-xusr/local/www/pkg_mgr.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index c4bdb0e..e5f5a4b 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -651,4 +651,4 @@ function parse_package_templates() {
}
}
-?> \ No newline at end of file
+?>
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index daafea3..a8c543c 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -73,8 +73,8 @@ include("fbegin.inc");
// Allow package location to be overriden
$config_location = "http://www.pfsense.com/packages/pkg_config.xml";
-if($config['package_location'])
- $config_location = $config['package_location'];
+if(isset($config['system']['alt_pkg_url']))
+ $config_location = $config['system']['alt_pkg_url'];
if(!file_exists("{$g['tmp_path']}/pkg_config.xml")) {
mwexec("cd {$g['tmp_path']} && /usr/bin/fetch \"" . $config_location . "\" >/dev/null 2>&1 ");
OpenPOWER on IntegriCloud