Bug #6149 ยป pkg-proxy.diff
| src/etc/inc/pkg-utils.inc | ||
|---|---|---|
|
"ASSUME_ALWAYS_YES" => "true"
|
||
|
);
|
||
|
if (!empty($config['system']['proxyurl'])) {
|
||
|
$http_proxy = $config['system']['proxyurl'];
|
||
|
if (!empty($config['system']['proxyport'])) {
|
||
|
$http_proxy .= ':' . $config['system']['proxyport'];
|
||
|
}
|
||
|
$pkg_env_vars['HTTP_PROXY'] = $http_proxy;
|
||
|
}
|
||
|
if ($g['platform'] == "nanobsd" ||
|
||
|
isset($config['system']['use_mfs_tmpvar'])) {
|
||
|
$pkg_env_vars['PKG_DBDIR'] = '/root/var/db/pkg';
|
||
| src/usr/local/sbin/pfSense-upgrade | ||
|---|---|---|
|
logfile="/cf/conf/upgrade_log.txt"
|
||
|
stdout='/dev/null'
|
||
|
# Setup proxy settings
|
||
|
HTTP_PROXY=$(/usr/local/sbin/read_xml_tag.sh string system/proxyurl)
|
||
|
if [ "${HTTP_PROXY}" != "" ]; then
|
||
|
HTTP_PROXY_PORT=$(/usr/local/sbin/read_xml_tag.sh string system/proxyport)
|
||
|
if [ "${HTTP_PROXY_PORT}" != "" ]; then
|
||
|
HTTP_PROXY="${HTTP_PROXY}:${HTTP_PROXY_PORT}"
|
||
|
fi
|
||
|
export HTTP_PROXY
|
||
|
fi
|
||
|
# pkg should not ask for confirmations
|
||
|
export ASSUME_ALWAYS_YES=true
|
||