From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Fri, 11 Apr 2014 15:01:51 +0000 (-0500)
Subject: cgmanager: don't call nih_dbus_setup
X-Git-Tag: lxc-1.1.0.alpha1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccab6c60290d2cc0592dbf380277f05f06617cdc;p=thirdparty%2Flxc.git

cgmanager: don't call nih_dbus_setup

it actually sets us up to run the nih_mainloop, but we will never run
that.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index 1dea824b9..fc959ec03 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,