firmware: os-update is going to become opnsense-update

This commit is contained in:
Franco Fichtner 2015-07-29 13:35:53 +02:00
parent 0ba08578e8
commit c7c47ac813
2 changed files with 15 additions and 2 deletions

View File

@ -110,7 +110,7 @@ POSSIBILITY OF SUCH DAMAGE.
BootstrapDialog.show({
type:BootstrapDialog.TYPE_WARNING,
title: 'Reboot required',
message: 'This upgrade may require a reboot, when needed the firewall will automatically reboot!',
message: 'The firewall will be rebooted directly after this firmware update.',
buttons: [{
label: 'Ok',
action: function(dialogRef){

View File

@ -118,7 +118,20 @@ if [ "$pkg_running" == "" ]; then
download_size="none"
fi
upgrade_needs_reboot=`pkg upgrade -nq os-update | grep UPGRADED | wc -l | awk '{print $1;}'`
# XXX backwards compat
LOCAL=opnsense-update
if pkg query %n os-update > /dev/null; then
LOCAL=os-update
fi
REMOTE=opnsense-update
if pkg rquery %n os-update > /dev/null; then
REMOTE=os-update
fi
# only version change requires reboot
if [ "$(pkg query %v ${LOCAL})" != "$(pkg rquery %v ${REMOTE})" ]; then
upgrade_needs_reboot="1"
fi
# First check if there are new packages that need to be installed
for i in $(cat $tmp_pkg_output_file); do