picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

import: now that the worker binary is called "systemd-pull" we can shorten the verbs

Browse source 
Atfer all "systemd-pull pull-tar" is unnecessarily redundant, over
"systemd-pull tar"...
This commit is contained in:
Lennart Poettering 2015-01-22 17:38:10 +01:00
parent ff828763c4
commit aa9bd4992f
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/import/importd.c
View file

@ -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 */

14
src/import/pull.c
View file

@ -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 },
{}
};