From 817a0e46b663b9a3cd3fe8f49caed98fd9015c91 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 27 Jan 2018 14:43:14 +0100 Subject: [PATCH] tools: make "-n" optional This lets users use the tools with "lxc-* -n " or "lxc-* ". Signed-off-by: Christian Brauner --- src/lxc/tools/arguments.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/lxc/tools/arguments.c b/src/lxc/tools/arguments.c index 30fb714fd..272340b65 100644 --- a/src/lxc/tools/arguments.c +++ b/src/lxc/tools/arguments.c @@ -256,10 +256,18 @@ extern int lxc_arguments_parse(struct lxc_arguments *args, int argc, } /* Check the command options */ - if (!args->name && strcmp(args->progname, "lxc-autostart") != 0) { - lxc_error(args, "missing container name, use --name option"); - return -1; + if (args->argv) { + args->name = argv[optind]; + optind++; + args->argv = &argv[optind]; + args->argc = argc - optind; + } + + if (!args->name) { + lxc_error(args, "No container name specified"); + return -1; + } } if (args->checker) -- 2.47.2