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.
This commit is contained in:
Franco Fichtner 2017-07-11 07:04:47 +02:00
parent cbc2292f49
commit 951ea35c3a

View File

@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
# Copyright (C) 2015-2017 Franco Fichtner <franco@opnsense.org>
# 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,