diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-27 19:41:30 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-27 19:41:30 -0300 |
| commit | a32867f51d926a0d9fd4f9fc59714d2784f68b11 (patch) | |
| tree | 65fccda3a47c77af15c9f84c7a01add665c32607 | |
| parent | 66f469dfe295f60b244a74097691f4c5ada01690 (diff) | |
| download | pfsense-a32867f51d926a0d9fd4f9fc59714d2784f68b11.zip pfsense-a32867f51d926a0d9fd4f9fc59714d2784f68b11.tar.gz | |
Reduce values of FETCH_TIMEOUT and FETCH_RETRY to help ticket #6177
| -rw-r--r-- | src/etc/inc/pkg-utils.inc | 4 | ||||
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/etc/inc/pkg-utils.inc b/src/etc/inc/pkg-utils.inc index a759aae..7ea584f 100644 --- a/src/etc/inc/pkg-utils.inc +++ b/src/etc/inc/pkg-utils.inc @@ -106,7 +106,9 @@ function pkg_env($extra_env = array()) { $pkg_env_vars = array( "LANG" => "C", "HTTP_USER_AGENT" => $user_agent, - "ASSUME_ALWAYS_YES" => "true" + "ASSUME_ALWAYS_YES" => "true", + "FETCH_TIMEOUT" => 5, + "FETCH_RETRY" => 2 ); if (!empty($config['system']['proxyurl'])) { diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index b5b7e5a..bc36d32 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -744,6 +744,8 @@ fi # pkg should not ask for confirmations export ASSUME_ALWAYS_YES=true +export FETCH_TIMEOUT=5 +export FETCH_RETRY=2 export product=$(/usr/local/bin/php -n /usr/local/sbin/read_global_var product_name pfSense) export pkg_prefix=$(/usr/local/bin/php -n /usr/local/sbin/read_global_var pkg_prefix pfSense-pkg-) |
