From 951ea35c3a9273a4d5692ab95ca92a7a02c5da7d Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 11 Jul 2017 07:04:47 +0200 Subject: [PATCH] firmware: always perform all upgrades from here opnsense-update can still be used to selectively upgrade, but here we shouldn't take any chances. Worst case the system will reboot prompting "nothing to do", which isn't true because we only know about the base and kernel, not the packages state. --- src/opnsense/scripts/firmware/upgrade.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opnsense/scripts/firmware/upgrade.sh b/src/opnsense/scripts/firmware/upgrade.sh index 683015813..27ad30354 100755 --- a/src/opnsense/scripts/firmware/upgrade.sh +++ b/src/opnsense/scripts/firmware/upgrade.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2015-2016 Franco Fichtner +# Copyright (C) 2015-2017 Franco Fichtner # Copyright (C) 2014 Deciso B.V. # All rights reserved. # @@ -54,7 +54,7 @@ elif [ "$PACKAGE" == "maj" ]; then fi # perform first half of major upgrade # (download all + kernel install) - if opnsense-update -ur "${NAME}" >> ${PKG_PROGRESS_FILE} 2>&1; then + if opnsense-update -ufr "${NAME}" >> ${PKG_PROGRESS_FILE} 2>&1; then REBOOT=1 fi # second half reboots multiple times,