From 0e858edc39dcfdcece2c9c4769b69701ba5fab00 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Thu, 14 Dec 2017 22:25:58 +0000 Subject: [PATCH] firmware: strip arch from kerne/base display; closes #1992 --- src/opnsense/scripts/firmware/check.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/opnsense/scripts/firmware/check.sh b/src/opnsense/scripts/firmware/check.sh index 38edf859c..2ce4a3087 100755 --- a/src/opnsense/scripts/firmware/check.sh +++ b/src/opnsense/scripts/firmware/check.sh @@ -232,10 +232,12 @@ if [ "$pkg_running" == "" ]; then # the main update from package will override this during upgrade if [ -z "$base_to_reboot" ]; then base_to_reboot="$(opnsense-update -v)" + base_to_reboot="${base_to_reboot%-*}" fi fi if [ -n "$base_to_reboot" ]; then base_to_delete="$(opnsense-update -bv)" + base_to_delete="${base_to_delete%-*}" base_is_size="$(opnsense-update -bfS)" upgrade_needs_reboot="1" if [ "$base_to_reboot" != "$base_to_delete" -a -n "$base_is_size" ]; then @@ -254,10 +256,12 @@ if [ "$pkg_running" == "" ]; then # the main update from package will override this during upgrade if [ -z "$kernel_to_reboot" ]; then kernel_to_reboot="$(opnsense-update -v)" + kernel_to_reboot="${kernel_to_reboot%-*}" fi fi if [ -n "$kernel_to_reboot" ]; then kernel_to_delete="$(opnsense-update -kv)" + kernel_to_delete="${kernel_to_delete%-*}" kernel_is_size="$(opnsense-update -fkS)" upgrade_needs_reboot="1" if [ "$kernel_to_reboot" != "$kernel_to_delete" -a -n "$kernel_is_size" ]; then