[lxc-devel] [PATCH 1/1] cgmanager: don't call nih_dbus_setup

[Stéphane Graber]

On Fri, Apr 11, 2014 at 10:01:51AM -0500, Serge Hallyn wrote:
> it actually sets us up to run the nih_mainloop, but we will never run
> that.
> 
> Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  src/lxc/cgmanager.c | 11 -----------
>  1 file changed, 11 deletions(-)
> 
> diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
> index 1dea824..fc959ec 100644
> --- a/src/lxc/cgmanager.c
> +++ b/src/lxc/cgmanager.c
> @@ -147,17 +147,6 @@ static bool cgm_dbus_connect(void)
>  		cgm_unlock();
>  		return false;
>  	}
> -	if (nih_dbus_setup(connection, NULL) < 0) {
> -		NihError *nerr;
> -		nerr = nih_error_get();
> -		DEBUG("Unable to open cgmanager connection at %s: %s", CGMANAGER_DBUS_SOCK,
> -			nerr->message);
> -		nih_free(nerr);
> -		dbus_error_free(&dbus_error);
> -		dbus_connection_unref(connection);
> -		cgm_unlock();
> -		return false;
> -	}
>  	dbus_connection_set_exit_on_disconnect(connection, FALSE);
>  	dbus_error_free(&dbus_error);
>  	cgroup_manager = nih_dbus_proxy_new(NULL, connection,
> -- 
> 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/20140411/9b24059c/attachment.sig>