From b8ff445601d72212133fa617cc67752b042e87e1 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 11 Jul 2018 07:39:45 +0000 Subject: [PATCH] firmware: ask for the right base/kernel in edge case We already know a new kernel/base is there, but look up the old one which may fail if it has been deleted. This causes the sets to be omitted from the update list, even though later on the upgrade works as expected. --- 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 bcbcc2ba2..61d8ce988 100755 --- a/src/opnsense/scripts/firmware/check.sh +++ b/src/opnsense/scripts/firmware/check.sh @@ -279,7 +279,7 @@ if [ "$pkg_running" == "" ]; then if [ -n "$base_to_reboot" ]; then base_to_delete="$(opnsense-update -bv)" base_to_delete="${base_to_delete%-*}" - base_is_size="$(opnsense-update -bfS)" + base_is_size="$(opnsense-update -bfSr $base_to_reboot)" upgrade_needs_reboot="1" if [ "$base_to_reboot" != "$base_to_delete" -a -n "$base_is_size" ]; then if [ "$packages_upgraded" == "" ]; then @@ -307,7 +307,7 @@ if [ "$pkg_running" == "" ]; then if [ -n "$kernel_to_reboot" ]; then kernel_to_delete="$(opnsense-update -kv)" kernel_to_delete="${kernel_to_delete%-*}" - kernel_is_size="$(opnsense-update -fkS)" + kernel_is_size="$(opnsense-update -fkSr $kernel_to_reboot)" upgrade_needs_reboot="1" if [ "$kernel_to_reboot" != "$kernel_to_delete" -a -n "$kernel_is_size" ]; then if [ "$packages_upgraded" == "" ]; then