[lxc-devel] [PATCH 3/3] execute: try lxc.init.static as last resort

[Stéphane Graber]

On Mon, May 12, 2014 at 06:04:20PM +0000, Serge Hallyn wrote:
> Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>

I don't have any problem with that change except that it may need
changing per my comment on 2/3.

Acked-by: Stéphane Graber <stgraber 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
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140519/1c2130c0/attachment.sig>