diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-02 10:35:07 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-02 10:38:47 -0200 |
| commit | 1855c106e54158c1075fa60b99eeafe5ff4d4232 (patch) | |
| tree | b99cc0e5fc124cd1ef0d35eb8b7505998280cb90 /src | |
| parent | f362c73bb7eb00b297fdf9be5895cbb94548558f (diff) | |
| download | pfsense-1855c106e54158c1075fa60b99eeafe5ff4d4232.zip pfsense-1855c106e54158c1075fa60b99eeafe5ff4d4232.tar.gz | |
Revert "Fix #5831"
This reverts commit 93a8ddf7a4c5d43cbeb623c923eb76659e6f49e0.
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 b82464b..b3edf96 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -382,9 +382,9 @@ pkg_upgrade() { fi fi - if [ $(pkg ${pkg_chroot} upgrade -Unq | wc -l) -gt 1 ]; then + if [ $(pkg ${pkg_chroot} upgrade -nq | wc -l) -gt 1 ]; then _echo "Upgrading necessary packages..." - if ! pkg ${pkg_chroot} upgrade -U 2>&1 | tee -a ${logfile}; then + if ! pkg ${pkg_chroot} upgrade 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..." @@ -413,9 +413,9 @@ pkg_upgrade() { fi if [ "${next_stage}" = "3" ]; then - if [ $(pkg upgrade -Unq | wc -l) -gt 1 ]; then + if [ $(pkg upgrade -nq | wc -l) -gt 1 ]; then _echo "Upgrading necessary packages..." - if ! pkg ${pkg_chroot} upgrade -U 2>&1 | tee -a ${logfile}; then + if ! pkg ${pkg_chroot} upgrade 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 |
