From 041cb4999b6d611d939c33f891f5330ca6e403f4 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 2 Jun 2014 22:03:46 -0500
Subject: [PATCH] execute: try /lxc.init.static as last resort
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---
 src/lxc/execute.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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;