Remove cgroups-agent, it is not really needed.

diff --git a/.gitignore b/.gitignore
index 150be32fad8b7a85cd61636af61ffccb8cf460b2..6bcc9971a00f78b887e5719970dc8c25c6244567 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -295,3 +295,4 @@ elogind_patches.lst
 /patches/
 /elogind.cbp
 /elogind.layout*
+*.bak

diff --git a/Makefile.am b/Makefile.am
index 2a4255ad69371e7353fc9a0623e599c9e3f8e693..fb91eba364746ec9014888d3453dacbe33558df2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -117,7 +117,6 @@ AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
        -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-       -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
@@ -469,16 +468,6 @@ dist_factory_pam_DATA = \
        factory/etc/pam.d/other
 endif
 
-# ------------------------------------------------------------------------------
-rootlibexec_PROGRAMS += \
-       elogind-cgroups-agent
-
-elogind_cgroups_agent_SOURCES = \
-       src/cgroups-agent/cgroups-agent.c
-
-elogind_cgroups_agent_LDADD = \
-       libshared.la
-
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
        src/systemd/sd-bus.h \

diff --git a/src/cgroups-agent/Makefile b/src/cgroups-agent/Makefile
deleted file mode 120000 (symlink)
index d0b0e8e..0000000
--- a/src/cgroups-agent/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile
\ No newline at end of file

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
deleted file mode 100644 (file)
index 612bc8f..0000000
--- a/src/cgroups-agent/cgroups-agent.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <stdlib.h>
-
-#include "sd-bus.h"
-#include "log.h"
-#include "bus-util.h"
-
-int main(int argc, char *argv[]) {
-        _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
-        int r;
-
-        if (argc != 2) {
-                log_error("Incorrect number of arguments.");
-                return EXIT_FAILURE;
-        }
-
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
-
-        /* We send this event to the private D-Bus socket and then the
-         * system instance will forward this to the system bus. We do
-         * this to avoid an activation loop when we start dbus when we
-         * are called when the dbus service is shut down. */
-
-        r = bus_open_system_systemd(&bus);
-        if (r < 0) {
-                /* If we couldn't connect we assume this was triggered
-                 * while systemd got restarted/transitioned from
-                 * initrd to the system, so let's ignore this */
-                log_debug_errno(r, "Failed to get D-Bus connection: %m");
-                return EXIT_FAILURE;
-        }
-
-        r = sd_bus_emit_signal(bus,
-                               "/org/freedesktop/systemd1/agent",
-                               "org.freedesktop.systemd1.Agent",
-                               "Released",
-                               "s", argv[1]);
-        if (r < 0) {
-                log_debug_errno(r, "Failed to send signal message on private connection: %m");
-                return EXIT_FAILURE;
-        }
-
-        return EXIT_SUCCESS;
-}