From a42e3b68a6f4587dd4c99bb90566734815d11c82 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 12 Jul 2017 08:04:13 +0200 Subject: [PATCH] firmware: rather don't use -f, useful for testing but that's done --- src/etc/rc.firmware.subr | 2 +- src/opnsense/scripts/firmware/upgrade.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/rc.firmware.subr b/src/etc/rc.firmware.subr index 8d27d4a2a..ca7923e7b 100755 --- a/src/etc/rc.firmware.subr +++ b/src/etc/rc.firmware.subr @@ -65,7 +65,7 @@ if [ -z "${RELEASE}" ]; then else # upgrade to a major release ${TEE} ${LOCKFILE} < ${PIPEFILE} & - if opnsense-update -ufr ${RELEASE} 2>&1 > ${PIPEFILE}; then + if opnsense-update -ur ${RELEASE} 2>&1 > ${PIPEFILE}; then echo '***REBOOT***' >> ${LOCKFILE} sleep 5 /usr/local/etc/rc.reboot diff --git a/src/opnsense/scripts/firmware/upgrade.sh b/src/opnsense/scripts/firmware/upgrade.sh index 27ad30354..d011a5d71 100755 --- a/src/opnsense/scripts/firmware/upgrade.sh +++ b/src/opnsense/scripts/firmware/upgrade.sh @@ -54,7 +54,7 @@ elif [ "$PACKAGE" == "maj" ]; then fi # perform first half of major upgrade # (download all + kernel install) - if opnsense-update -ufr "${NAME}" >> ${PKG_PROGRESS_FILE} 2>&1; then + if opnsense-update -ur "${NAME}" >> ${PKG_PROGRESS_FILE} 2>&1; then REBOOT=1 fi # second half reboots multiple times,