[lxc-devel] [PATCH 3/3] execute: try lxc.init.static as last resort
Serge Hallyn
serge.hallyn at ubuntu.com
Mon May 12 18:04:20 UTC 2014
Signed-off-by: Serge Hallyn <serge.hallyn at 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 651c47d..a90d690 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, SBINDIR "/init.lxc.static");
+ if (ret < 0 || ret >= PATH_MAX) {
+ WARN("Path name too long searching for lxc.init.static");
+ goto out1;
+ }
+ ret = stat(retv, &mystat);
+ if (ret == 0)
+ return retv;
+
out1:
free(retv);
return NULL;
--
1.9.1
More information about the lxc-devel
mailing list