From 7f444afa1b62920265fec99a61cb4dc53d521956 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 22 Jan 2015 15:13:53 +0100 Subject: import: rename --verify=sum to --verify=checksum This is how we call it internally, and also a bit more descriptive. --- src/import/import.c | 4 ++-- src/machine/machinectl.c | 4 ++-- src/shared/import-util.c | 2 +- src/shared/import-util.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/import/import.c b/src/import/import.c index 5b1d0c1417..9bd8b77477 100644 --- a/src/import/import.c +++ b/src/import/import.c @@ -323,8 +323,8 @@ static int help(int argc, char *argv[], void *userdata) { " -h --help Show this help\n" " --version Show package version\n" " --force Force creation of image\n" - " --verify= Verify downloaded image, one of: 'no', 'sum'\n" - " 'signature'.\n" + " --verify= Verify downloaded image, one of: 'no',\n" + " 'checksum', 'signature'.\n" " --image-root= Image root directory\n" " --dkr-index-url=URL Specify index URL to use for downloads\n\n" "Commands:\n" diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 11b2c004b8..fa98d0b03e 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -2218,8 +2218,8 @@ static int help(int argc, char *argv[], void *userdata) { " -o --output=STRING Change journal output mode (short,\n" " short-monotonic, verbose, export, json,\n" " json-pretty, json-sse, cat)\n" - " --verify=MODE Verification mode for downloaded images (no, sum,\n" - " signature)\n" + " --verify=MODE Verification mode for downloaded images (no,\n" + " checksum, signature)\n" " --force Download image even if already exists\n" " --dkr-index-url=URL Specify the index URL to use for DKR image\n" " downloads\n\n" diff --git a/src/shared/import-util.c b/src/shared/import-util.c index 46671e8c99..660d92ac5d 100644 --- a/src/shared/import-util.c +++ b/src/shared/import-util.c @@ -76,7 +76,7 @@ int import_url_change_last_component(const char *url, const char *suffix, char * static const char* const import_verify_table[_IMPORT_VERIFY_MAX] = { [IMPORT_VERIFY_NO] = "no", - [IMPORT_VERIFY_SUM] = "sum", + [IMPORT_VERIFY_CHECKSUM] = "checksum", [IMPORT_VERIFY_SIGNATURE] = "signature", }; diff --git a/src/shared/import-util.h b/src/shared/import-util.h index da87a4012b..ff155b0ff2 100644 --- a/src/shared/import-util.h +++ b/src/shared/import-util.h @@ -27,7 +27,7 @@ typedef enum ImportVerify { IMPORT_VERIFY_NO, - IMPORT_VERIFY_SUM, + IMPORT_VERIFY_CHECKSUM, IMPORT_VERIFY_SIGNATURE, _IMPORT_VERIFY_MAX, _IMPORT_VERIFY_INVALID = -1, -- cgit v1.2.3-54-g00ecf