mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

autoupdater: execute sysupgrade test before network shutdown 

Currently the autoupdater stops network prior starting the sysupgrade
process.

This has the issue of leaving the device in a state with stopped network
in case the sysupgrade process fails, as execl does not spawn a
subprocess but instead replaces the current process with another one, in
our case the sysupgrade process.

This commit modifies the autoupdater behavior in a way it starts
sysupgrade in test mode prior stopping network. This way, common causes
for failing the sysupgrade process can be detected in a
remote-recoverable manner, most prominently a failed platform check /
incompatible images.

Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2021-08-18 22:14:18 +02:00
parent 83534952a5
commit 27f9ec75b2
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
admin/autoupdater/src/autoupdater.c
View File

@ -48,6 +48,7 @@
#include <sys/types.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/wait.h>
#define MAX_LINE_LENGTH 512
@ -275,6 +276,30 @@ static void recv_image_cb(struct uclient *cl) {
}
}
static int sysupgrade_image_check(const char *image_path)
{
int status;
pid_t pid;
int ret;
if ((pid = fork()) == 0) {
execl(sysupgrade_path, sysupgrade_path, "-T", firmware_path, NULL);
_exit(127);
}
if (pid < 0)
return pid;
ret = waitpid(pid, &status, 0);
if (ret < 0)
return -1;
if (!WIFEXITED(status))
return -1;
return WEXITSTATUS(status);
}
static bool autoupdate(const char *mirror, struct settings *s, int lock_fd) {
bool ret = false;
@ -380,6 +405,13 @@ static bool autoupdate(const char *mirror, struct settings *s, int lock_fd) {
clear_manifest(m);
/* Test if the image is compatible with the device. This avoids bringing down services. */
if (sysupgrade_image_check(firmware_path)) {
/* Image not compatible */
fputs("autoupdater: error: image not compatible with device\n", stderr);
goto fail_after_download;
}
/**** Call sysupgrade ************************************************/
if (s->no_action) {
printf(