From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 3 Jun 2014 03:03:46 +0000 (-0500)
Subject: execute: try /lxc.init.static as last resort
X-Git-Tag: lxc-1.1.0.alpha1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=041cb4999b6d611d939c33f891f5330ca6e403f4;p=thirdparty%2Flxc.git

execute: try /lxc.init.static as last resort

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/execute.c b/src/lxc/execute.c
index 651c47d99..4ebc214ab 100644
--- a/src/lxc/execute.c
+++ b/src/lxc/execute.c
@@ -104,6 +104,20 @@ static char *choose_init(void)
 	ret = stat(retv, &mystat);
 	if (ret == 0)
 		return retv;
+
+	/*
+	 * Last resort, look for the statically compiled init.lxc which we
+	 * hopefully bind-mounted in
+	 */
+	ret = snprintf(retv, PATH_MAX, "/init.lxc.static");
+	if (ret < 0 || ret >= PATH_MAX) {
+		WARN("Nonsense - name /lxc.init.static too long");
+		goto out1;
+	}
+	ret = stat(retv, &mystat);
+	if (ret == 0)
+		return retv;
+
 out1:
 	free(retv);
 	return NULL;