diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-01 09:19:43 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-01 09:19:43 -0200 |
| commit | 93a8ddf7a4c5d43cbeb623c923eb76659e6f49e0 (patch) | |
| tree | 7f2b7352551e4ef4cc1679eeaeeb7524f7779f0e /src | |
| parent | 2bdc326a497bd4a4801e8c1cb31a7e1d5c42148c (diff) | |
| download | pfsense-93a8ddf7a4c5d43cbeb623c923eb76659e6f49e0.zip pfsense-93a8ddf7a4c5d43cbeb623c923eb76659e6f49e0.tar.gz | |
Fix #5831
After PKG_AUTOUPDATE=false was removed, operations done during boot,
2nd and 3rd stages of upgrade process, are trying to update repository
metadata. The problem is during this stage we don't have a network
available yet and all needed packages were previously downloaded.
Add -U parameter to all read/write pkg calls during at these stages to
prevent pkg(8) to try to update metadata
Diffstat (limited to 'src')
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 65a0e04..665f1b7 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -381,9 +381,9 @@ pkg_upgrade() { fi fi - if [ $(pkg ${pkg_chroot} upgrade -nq | wc -l) -gt 1 ]; then + if [ $(pkg ${pkg_chroot} upgrade -Unq | wc -l) -gt 1 ]; then _echo "Upgrading necessary packages..." - if ! pkg ${pkg_chroot} upgrade 2>&1 | tee -a ${logfile}; then + if ! pkg ${pkg_chroot} upgrade -U 2>&1 | tee -a ${logfile}; then pkg ${pkg_chroot} annotate -q -D ${kernel_pkg} next_stage pkg_unlock "${pkg_prefix}*" _echo "ERROR: An error occurred when upgrade was running..." @@ -412,9 +412,9 @@ pkg_upgrade() { fi if [ "${next_stage}" = "3" ]; then - if [ $(pkg upgrade -nq | wc -l) -gt 1 ]; then + if [ $(pkg upgrade -Unq | wc -l) -gt 1 ]; then _echo "Upgrading necessary packages..." - if ! pkg ${pkg_chroot} upgrade 2>&1 | tee -a ${logfile}; then + if ! pkg ${pkg_chroot} upgrade -U 2>&1 | tee -a ${logfile}; then pkg ${pkg_chroot} annotate -q -D ${kernel_pkg} next_stage _echo "ERROR: An error occurred when upgrade was running..." _exit 1 |
