lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 11:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: remove "bsd" glue, it works without it

Browse Source
This commit is contained in:
Franco Fichtner 2017-10-08 13:59:23 +00:00
parent 6a05ba54b7
commit ca9f2f3b85
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
View File

@ -57,15 +57,6 @@ class FirmwareController extends ApiControllerBase
} elseif (array_key_exists('repository', $response) && $response['repository'] == 'error') {
$response['status_msg'] = gettext('Could not find the repository on the selected mirror.');
$response['status'] = 'error';
} elseif (array_key_exists('updates', $response) && $response['updates'] == 0) {
if (array_key_exists('upgrade_needs_reboot', $response) && $response['upgrade_needs_reboot'] == 1) {
$response['status_msg'] = gettext('Operating system updates are available, total download size is unknown.');
$response['status_upgrade_action'] = 'bsd';
$response['status'] = 'ok';
} else {
$response['status_msg'] = gettext('There are no updates available on the selected mirror.');
$response['status'] = 'none';
}
} elseif (array_key_exists(0, $response['upgrade_packages']) &&
$response['upgrade_packages'][0]['name'] == 'pkg') {
$response['status_upgrade_action'] = 'pkg';
@ -95,6 +86,9 @@ class FirmwareController extends ApiControllerBase
gettext('This update requires a reboot.')
);
}
} else {
$response['status_msg'] = gettext('There are no updates available on the selected mirror.');
$response['status'] = 'none';
}
$sorted = array();
@ -286,8 +280,6 @@ class FirmwareController extends ApiControllerBase
$action = 'firmware upgrade pkg';
} elseif ($this->request->getPost('upgrade') == 'maj') {
$action = 'firmware upgrade maj';
} elseif ($this->request->getPost('upgrade') == 'bsd') {
$action = 'firmware upgrade bsd';
} else {
$action = 'firmware upgrade all';
}

2
src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
View File

@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
$('#updatelist').show();
}
$("#checkupdate_progress").addClass("fa fa-spinner fa-pulse");
$('#updatestatus').html("{{ lang._('Checking... (may take up to 30 seconds)') }}");
$('#updatestatus').html("{{ lang._('Checking, please wait...') }}");
}
/**

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

@ -54,7 +54,7 @@ download_size="none"
itemcount=0
linecount=0
timer=0
timeout=45 # Wait for a maximum number of seconds to determine connection issues
timeout=60 # Wait for a maximum number of seconds to determine connection issues
# File location variables
tmp_pkg_output_file="/tmp/packages.output"
@ -241,6 +241,7 @@ if [ "$pkg_running" == "" ]; then
fi
packages_upgraded=$packages_upgraded"\"current_version\":\"$(opnsense-update -bv)\","
packages_upgraded=$packages_upgraded"\"new_version\":\"$(opnsense-update -v)\"}"
updates=$(expr $updates + 1)
upgrade_needs_reboot="1"
fi
if opnsense-update -cfk; then
@ -251,6 +252,7 @@ if [ "$pkg_running" == "" ]; then
fi
packages_upgraded=$packages_upgraded"\"current_version\":\"$(opnsense-update -kv)\","
packages_upgraded=$packages_upgraded"\"new_version\":\"$(opnsense-update -v)\"}"
updates=$(expr $updates + 1)
upgrade_needs_reboot="1"
fi
fi

6
src/opnsense/scripts/firmware/upgrade.sh
View File

@ -45,12 +45,6 @@ if [ "$PACKAGE" == "all" ]; then
REBOOT=1
fi
fi
elif [ "$PACKAGE" == "bsd" ]; then
if opnsense-update -c >> ${PKG_PROGRESS_FILE} 2>&1; then
if opnsense-update -bk >> ${PKG_PROGRESS_FILE} 2>&1; then
REBOOT=1
fi
fi
elif [ "$PACKAGE" == "maj" ]; then
# extract info for major upgrade
UPGRADE="/usr/local/opnsense/firmware-upgrade"