From 4d16653fc59d2d523ae5591c0533439a540bf0fa Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 23 Oct 2018 06:14:37 +0200 Subject: [PATCH] firmware: ask only once via expansion We only want to know if there is anything at all and "" + "" is still "". --- src/opnsense/scripts/firmware/check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh index a0b9e41b2..894ccc6d9 100755 --- a/src/opnsense/scripts/firmware/check.sh +++ b/src/opnsense/scripts/firmware/check.sh @@ -268,7 +268,7 @@ if [ "$pkg_running" == "" ]; then fi # the main update from package will provide this during upgrade - if [ -n "${pkg_upgraded}" -o -n "${pkg_selected}" ]; then + if [ -n "${pkg_upgraded}${pkg_selected}" ]; then base_to_reboot= elif [ -z "$base_to_reboot" ]; then if opnsense-update -cbf; then @@ -296,7 +296,7 @@ if [ "$pkg_running" == "" ]; then fi # the main update from package will provide this during upgrade - if [ -n "${pkg_upgraded}" -o -n "${pkg_selected}" ]; then + if [ -n "${pkg_upgraded}${pkg_selected}" ]; then kernel_to_reboot= elif [ -z "$kernel_to_reboot" ]; then if opnsense-update -cfk; then