]> git.proxmox.com Git - mirror_lxc.git/commitdiff
cgmanager: don't call nih_dbus_setup
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Fri, 11 Apr 2014 15:01:51 +0000 (10:01 -0500)
committerStéphane Graber <stgraber@ubuntu.com>
Fri, 11 Apr 2014 15:07:02 +0000 (11:07 -0400)
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>
src/lxc/cgmanager.c

index 1dea824b9eee1b84856c694ec336969f125abbf7..fc959ec0302fe44bead150d2c2b95eb7829e4b61 100644 (file)
@@ -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,