diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-01-22 17:38:10 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-01-22 17:50:50 +0100 |
| commit | aa9bd4992ff0240f6ceecb70ec364d5d9c7574f4 (patch) | |
| tree | b0d4df825d240aaf11a0f36bab41dd91ffb0253e | |
| parent | ff828763c40cd138658abf9ed7a19da73c92dec1 (diff) | |
import: now that the worker binary is called "systemd-pull" we can shorten the verbs
Atfer all "systemd-pull pull-tar" is unnecessarily redundant, over
"systemd-pull tar"...
| -rw-r--r-- | src/import/importd.c | 4 | ||||
| -rw-r--r-- | src/import/pull.c | 14 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/import/importd.c b/src/import/importd.c index 40900ce36d..92ad801306 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -343,9 +343,7 @@ static int transfer_start(Transfer *t) { if (t->pid == 0) { const char *cmd[] = { "systemd-pull", - t->type == TRANSFER_TAR ? "pull-tar" : - t->type == TRANSFER_RAW ? "pull-raw" : - "pull-dkr", + transfer_type_to_string(t->type), "--verify", NULL, /* verify argument */ NULL, /* maybe --force */ diff --git a/src/import/pull.c b/src/import/pull.c index 9bd8b77477..ee3ff68036 100644 --- a/src/import/pull.c +++ b/src/import/pull.c @@ -328,9 +328,9 @@ static int help(int argc, char *argv[], void *userdata) { " --image-root= Image root directory\n" " --dkr-index-url=URL Specify index URL to use for downloads\n\n" "Commands:\n" - " pull-tar URL [NAME] Download a TAR image\n" - " pull-raw URL [NAME] Download a RAW image\n" - " pull-dkr REMOTE [NAME] Download a DKR image\n", + " tar URL [NAME] Download a TAR image\n" + " raw URL [NAME] Download a RAW image\n" + " dkr REMOTE [NAME] Download a DKR image\n", program_invocation_short_name); return 0; @@ -412,10 +412,10 @@ static int parse_argv(int argc, char *argv[]) { static int import_main(int argc, char *argv[]) { static const Verb verbs[] = { - { "help", VERB_ANY, VERB_ANY, 0, help }, - { "pull-tar", 2, 3, 0, pull_tar }, - { "pull-raw", 2, 3, 0, pull_raw }, - { "pull-dkr", 2, 3, 0, pull_dkr }, + { "help", VERB_ANY, VERB_ANY, 0, help }, + { "tar", 2, 3, 0, pull_tar }, + { "raw", 2, 3, 0, pull_raw }, + { "dkr", 2, 3, 0, pull_dkr }, {} }; |