conf: avoid spawning unnecessary subshells

Signed-off-by: Jonathan Calmels <jcalmels@nvidia.com>

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 2f0d05ed58da89e8095e07a6a4b151bd2b14abe9..f8084475c0637335c17d2e8a942dcf393a8b0046 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -353,10 +353,11 @@ static int run_script_argv(const char *name, const char *section,
 
        size += strlen(hook) + 1;
 
+       size += strlen("exec");
        size += strlen(script);
        size += strlen(name);
        size += strlen(section);
-       size += 3;
+       size += 4;
 
        if (size > INT_MAX)
                return -1;
@@ -368,7 +369,7 @@ static int run_script_argv(const char *name, const char *section,
        }
 
        ret =
-           snprintf(buffer, size, "%s %s %s %s", script, name, section, hook);
+           snprintf(buffer, size, "exec %s %s %s %s", script, name, section, hook);
        if (ret < 0 || (size_t)ret >= size) {
                ERROR("Script name too long.");
                return -1;
@@ -403,10 +404,11 @@ int run_script(const char *name, const char *section, const char *script, ...)
                size += strlen(p) + 1;
        va_end(ap);
 
+       size += strlen("exec");
        size += strlen(script);
        size += strlen(name);
        size += strlen(section);
-       size += 3;
+       size += 4;
 
        if (size > INT_MAX)
                return -1;
@@ -417,7 +419,7 @@ int run_script(const char *name, const char *section, const char *script, ...)
                return -1;
        }
 
-       ret = snprintf(buffer, size, "%s %s %s", script, name, section);
+       ret = snprintf(buffer, size, "exec %s %s %s", script, name, section);
        if (ret < 0 || ret >= size) {
                ERROR("Script name too long.");
                return -1;