1
0
mirror of https://github.com/j-a-n/raspberrymatic-addon-rmupdate.git synced 2023-10-10 11:37:40 +00:00

Replace /lib just before reboot, patch cmdline.txt and /etc/fstab

This commit is contained in:
Jan Schneider
2017-06-18 23:27:29 +02:00
parent 7c9d7e9492
commit 4af69aba51
5 changed files with 152 additions and 18 deletions

View File

@@ -83,8 +83,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
});
}
function installation_finished() {
if (installation_running) {
var version = installation_running;
$('[data-install-version="' + version + '"]').removeClass('loading');
installation_running = "";
msg = 'Firmware ' + version + ' successfully installed.'
display_message('success', msg, 6000000);
}
}
function update_install_log() {
rest("GET", "/read_install_log", null, function(data) {
var regex_success = /INSTALL_FIRMWARE_SUCCESS\n/g;
if (regex_success.test(data)) {
installation_finished();
}
data = data.replace(regex_success, "");
$('#log-content').html(data.replace(/\n/g, '<br />'));
$('#modal-log').modal('refresh');
$('#log-content').scrollTop($('#log-content').prop("scrollHeight"));
@@ -117,9 +132,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
clear_message();
rest("POST", "/start_install_firmware", JSON.stringify({"version":version, "reboot":reboot, "dryrun":dryrun}),
function(data) {
$('[data-install-version="' + installation_running + '"]').removeClass('loading');
installation_running = "";
display_message('success', 'Firmware ' + version + ' successfully installed.', 6000000);
installation_finished();
if (!reboot) {
get_firmware_info();
}
@@ -128,8 +141,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
$('[data-install-version="' + installation_running + '"]').removeClass('loading');
installation_running = "";
//$('#modal-log').modal('hide');
if (!reboot) {
get_firmware_info();
if (installation_running) {
//get_firmware_info();
default_error_callback(xhr, ajaxOptions, thrownError);
}
}

View File

@@ -75,7 +75,8 @@ proc process {} {
} elseif {[lindex $path 1] == "delete_firmware_image"} {
regexp {\"version\"\s*:\s*\"([\d\.]+)\"} $data match version
if { [info exists version] && $version != "" } {
return "\"[rmupdate::delete_firmware_image $version]\""
set res [rmupdate::delete_firmware_image $version]
return "\"${res}\""
} else {
error "Invalid version: ${data}"
}