lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: reboot hint only if download is possible; closes #2547

Browse Source
This commit is contained in:
Franco Fichtner 2018-07-15 14:00:27 +02:00
parent a7f87559ca
commit 46438e696b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opnsense/scripts/firmware/check.sh
View File

@ -280,7 +280,6 @@ if [ "$pkg_running" == "" ]; then
base_to_delete="$(opnsense-update -bv)"
base_to_delete="${base_to_delete%-*}"
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
packages_upgraded=$packages_upgraded"{\"name\":\"base\"," # If it is the first item then we do not want a seperator
@ -291,6 +290,7 @@ if [ "$pkg_running" == "" ]; then
packages_upgraded=$packages_upgraded"\"current_version\":\"$base_to_delete\","
packages_upgraded=$packages_upgraded"\"new_version\":\"$base_to_reboot\"}"
updates=$(expr $updates + 1)
upgrade_needs_reboot="1"
fi
fi
@ -308,7 +308,6 @@ if [ "$pkg_running" == "" ]; then
kernel_to_delete="$(opnsense-update -kv)"
kernel_to_delete="${kernel_to_delete%-*}"
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
packages_upgraded=$packages_upgraded"{\"name\":\"kernel\"," # If it is the first item then we do not want a seperator
@ -319,6 +318,7 @@ if [ "$pkg_running" == "" ]; then
packages_upgraded=$packages_upgraded"\"current_version\":\"$kernel_to_delete\","
packages_upgraded=$packages_upgraded"\"new_version\":\"$kernel_to_reboot\"}"
updates=$(expr $updates + 1)
upgrade_needs_reboot="1"
fi
fi
fi

5
src/opnsense/scripts/firmware/reboot.sh
View File

@ -33,6 +33,11 @@ DUMMY_UPDATE=$(${PKG} update 2>&1)
LQUERY=$(${PKG} query %v opnsense-update 2> /dev/null)
RQUERY=$(${PKG} rquery %v opnsense-update 2> /dev/null)
# We do not check for downloads here to make sure the actual version
# we want is acutally there. The whole point of this script is a
# hint to the console to reboot. Worst case we are wrong and the
# reboot doesn't happen. The GUI offers precise info about it.
if [ -n "${LQUERY}" -a -n "${RQUERY}" -a "${LQUERY%%_*}" != "${RQUERY%%_*}" ]; then
WANT_REBOOT=0
elif opnsense-update -c; then