From 19668d8b0798d4078f17f83241b6c113a0ed1bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 15 Jan 2014 22:53:20 -0500 Subject: [PATCH] lxc-create: Don't print the help message twice MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The forking logic was wrong, causing both the child and the parent to call the template with -h. Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- src/lxc/lxc_create.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c index 6d94709d1..058dc43bd 100644 --- a/src/lxc/lxc_create.c +++ b/src/lxc/lxc_create.c @@ -107,10 +107,13 @@ static void create_helpfn(const struct lxc_arguments *args) { if (!args->template) return; - if ((pid = fork()) < 0) - return; - if (pid) + + pid = fork(); + if (pid) { wait_for_pid(pid); + return; + } + len = strlen(LXCTEMPLATEDIR) + strlen(args->template) + strlen("/lxc-") + 1; path = alloca(len); ret = snprintf(path, len, "%s/lxc-%s", LXCTEMPLATEDIR, args->template);