From 9116e945923d355d2935f135ade54dd88cf5316a Mon Sep 17 00:00:00 2001
From: lemoer <git@irrelefant.net>
Date: Thu, 24 May 2018 22:03:51 +0200
Subject: [PATCH] autoupdater: switch from "--no-versioncheck" to
 "--force-downgrade"

---
 admin/autoupdater/src/autoupdater.c | 12 ++++++------
 admin/autoupdater/src/settings.h    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/admin/autoupdater/src/autoupdater.c b/admin/autoupdater/src/autoupdater.c
index f3590e0..f018f51 100644
--- a/admin/autoupdater/src/autoupdater.c
+++ b/admin/autoupdater/src/autoupdater.c
@@ -86,7 +86,7 @@ static void usage(void) {
 		"                       really flash a new firmware if one is available.\n\n"
 		"  --fallback           Upgrade if and only if the upgrade timespan of the new\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"
 		"                       specified, these are not shuffled.\n\n",
 		stderr
@@ -101,7 +101,7 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
 		OPTION_HELP = 'h',
 		OPTION_NO_ACTION = 'n',
 		OPTION_FALLBACK = 256,
-		OPTION_NO_VERSIONCHECK = 257,
+		OPTION_FORCE_VERSION = 257,
 	};
 
 	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},
 		{"fallback",  no_argument,       NULL, OPTION_FALLBACK},
 		{"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},
 	};
 
@@ -139,8 +139,8 @@ static void parse_args(int argc, char *argv[], struct settings *settings) {
 			settings->no_action = true;
 			break;
 
-		case OPTION_NO_VERSIONCHECK:
-			settings->no_versioncheck = true;
+		case OPTION_FORCE_VERSION:
+			settings->force_version = true;
 			break;
 
 		default:
@@ -328,7 +328,7 @@ static bool autoupdate(const char *mirror, struct settings *s, int lock_fd) {
 	}
 
 	/* 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.");
 		ret = true;
 		goto out;
diff --git a/admin/autoupdater/src/settings.h b/admin/autoupdater/src/settings.h
index 5959364..7ed68d1 100644
--- a/admin/autoupdater/src/settings.h
+++ b/admin/autoupdater/src/settings.h
@@ -33,7 +33,7 @@ struct settings {
 	bool force;
 	bool fallback;
 	bool no_action;
-	bool no_versioncheck;
+	bool force_version;
 	const char *branch;
 	unsigned long good_signatures;
 	char *old_version;