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

autoupdater: switch from "--no-versioncheck" to "--force-downgrade"

This commit is contained in:
lemoer 2018-05-24 22:03:51 +02:00
parent 8830b83d8f
commit 9116e94592
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ static void usage(void) {
" really flash a new firmware if one is available.\n\n" " really flash a new firmware if one is available.\n\n"
" --fallback Upgrade if and only if the upgrade timespan of the new\n" " --fallback Upgrade if and only if the upgrade timespan of the new\n"
" version has passed for at least 24 hours.\n\n" " version has passed for at least 24 hours.\n\n"
" --no-versioncheck Skip version check and allow downgrades therefore.\n\n" " --force-version Skip version check and allow downgrades therefore.\n\n"
" <mirror> ... Override the mirror URLs given in the configuration. If\n" " <mirror> ... Override the mirror URLs given in the configuration. If\n"
" specified, these are not shuffled.\n\n", " specified, these are not shuffled.\n\n",
stderr stderr
@ -101,7 +101,7 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
OPTION_HELP = 'h', OPTION_HELP = 'h',
OPTION_NO_ACTION = 'n', OPTION_NO_ACTION = 'n',
OPTION_FALLBACK = 256, OPTION_FALLBACK = 256,
OPTION_NO_VERSIONCHECK = 257, OPTION_FORCE_VERSION = 257,
}; };
const struct option options[] = { const struct option options[] = {
@ -109,7 +109,7 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
{"force", no_argument, NULL, OPTION_FORCE}, {"force", no_argument, NULL, OPTION_FORCE},
{"fallback", no_argument, NULL, OPTION_FALLBACK}, {"fallback", no_argument, NULL, OPTION_FALLBACK},
{"no-action", no_argument, NULL, OPTION_NO_ACTION}, {"no-action", no_argument, NULL, OPTION_NO_ACTION},
{"no-versioncheck", no_argument, NULL, OPTION_NO_VERSIONCHECK}, {"force-version", no_argument, NULL, OPTION_FORCE_VERSION},
{"help", no_argument, NULL, OPTION_HELP}, {"help", no_argument, NULL, OPTION_HELP},
}; };
@ -139,8 +139,8 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
settings->no_action = true; settings->no_action = true;
break; break;
case OPTION_NO_VERSIONCHECK: case OPTION_FORCE_VERSION:
settings->no_versioncheck = true; settings->force_version = true;
break; break;
default: default:
@ -328,7 +328,7 @@ static bool autoupdate(const char *mirror, struct settings *s, int lock_fd) {
} }
/* Check version and update probability */ /* Check version and update probability */
if (!newer_than(m->version, s->old_version) && !s->no_versioncheck) { if (!newer_than(m->version, s->old_version) && !s->force_version) {
puts("No new firmware available."); puts("No new firmware available.");
ret = true; ret = true;
goto out; goto out;

2
admin/autoupdater/src/settings.h
View File

@ -33,7 +33,7 @@ struct settings {
bool force; bool force;
bool fallback; bool fallback;
bool no_action; bool no_action;
bool no_versioncheck; bool force_version;
const char *branch; const char *branch;
unsigned long good_signatures; unsigned long good_signatures;
char *old_version; char *old_version;