From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 30 Jun 2017 13:30:18 +0000 (+0200)
Subject: lxc static init: report exec*() failure
X-Git-Tag: lxc-2.1.0~57^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8130d8646d5db0e599617eab15cf0bddd7dcaab7;p=thirdparty%2Flxc.git

lxc static init: report exec*() failure

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/tools/lxc_init.c b/src/lxc/tools/lxc_init.c
index 6b2355be7..cac1e8c02 100644
--- a/src/lxc/tools/lxc_init.c
+++ b/src/lxc/tools/lxc_init.c
@@ -178,6 +178,8 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 
 	if (!pid) {
+		int ret;
+
 		/* restore default signal handlers */
 		for (i = 1; i < NSIG; i++)
 			signal(i, SIG_DFL);
@@ -189,9 +191,9 @@ int main(int argc, char *argv[])
 
 		NOTICE("About to exec '%s'", aargv[0]);
 
-		execvp(aargv[0], aargv);
+		ret = execvp(aargv[0], aargv);
 		ERROR("Failed to exec: '%s' : %s", aargv[0], strerror(errno));
-		exit(err);
+		exit(ret);
 	}
 
 	/* let's process the signals now */