[lxc-devel] [PATCH] utmp.h: Don't fail when utmpx.h isn't present

[Serge Hallyn]

Quoting Stéphane Graber (stgraber at ubuntu.com):
> Following a comment on the mailing-list, I made utmp.h return -1
> when it's disabled, the problem with that is that it prevents the
> container from starting completely, which isn't quite what I wanted.
> 
> This change makes the function succeed, the container will therefore
> start but without utmp handler.
> 
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/utmp.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/lxc/utmp.h b/src/lxc/utmp.h
> index 1bd7c23..ad4a8ab 100644
> --- a/src/lxc/utmp.h
> +++ b/src/lxc/utmp.h
> @@ -32,6 +32,6 @@ int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr,
>  #else
>  static inline int lxc_utmp_mainloop_add(struct lxc_epoll_descr *descr,
>  			  struct lxc_handler *handler) {
> -		return -1;
> +		return 0;
>  }
>  #endif
> -- 
> 1.8.0
> 
> 
> ------------------------------------------------------------------------------
> Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
> MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
> with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
> MVPs and experts. ON SALE this month only -- learn more at:
> http://p.sf.net/sfu/learnmore_122712
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel