From 8bb15cce3ca7d192ffe13083752309ba74336be7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 1 Feb 2017 23:16:40 -0500 Subject: move systemd-cgroups-agent into grp-system --- src/Makefile | 1 - src/grp-system/Makefile | 2 + src/grp-system/systemd-cgroups-agent/Makefile | 33 +++++++++++ .../systemd-cgroups-agent/cgroups-agent.c | 67 ++++++++++++++++++++++ src/systemd-cgroups-agent/Makefile | 33 ----------- src/systemd-cgroups-agent/cgroups-agent.c | 67 ---------------------- 6 files changed, 102 insertions(+), 101 deletions(-) create mode 100644 src/grp-system/systemd-cgroups-agent/Makefile create mode 100644 src/grp-system/systemd-cgroups-agent/cgroups-agent.c delete mode 100644 src/systemd-cgroups-agent/Makefile delete mode 100644 src/systemd-cgroups-agent/cgroups-agent.c (limited to 'src') diff --git a/src/Makefile b/src/Makefile index d9e4ed57f2..7bea64ea42 100644 --- a/src/Makefile +++ b/src/Makefile @@ -49,7 +49,6 @@ nested.subdirs += nss-myhostname nested.subdirs += nss-systemd nested.subdirs += systemd-ask-password nested.subdirs += systemd-cgls -nested.subdirs += systemd-cgroups-agent nested.subdirs += systemd-cgtop nested.subdirs += systemd-cryptsetup nested.subdirs += systemd-debug-generator diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile index e9c6d7b07f..c3dad876f5 100644 --- a/src/grp-system/Makefile +++ b/src/grp-system/Makefile @@ -1,3 +1,4 @@ + # -*- Mode: makefile; indent-tabs-mode: t -*- # # This file is part of systemd. @@ -30,6 +31,7 @@ nested.subdirs += grp-utils nested.subdirs += libcore nested.subdirs += systemctl nested.subdirs += systemd +nested.subdirs += systemd-cgroups-agent nested.subdirs += systemd-shutdown include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemd-cgroups-agent/Makefile b/src/grp-system/systemd-cgroups-agent/Makefile new file mode 100644 index 0000000000..5d49f891fd --- /dev/null +++ b/src/grp-system/systemd-cgroups-agent/Makefile @@ -0,0 +1,33 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# 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 . +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +rootlibexec_PROGRAMS += systemd-cgroups-agent +systemd_cgroups_agent_SOURCES = \ + src/cgroups-agent/cgroups-agent.c + +systemd_cgroups_agent_LDADD = \ + libsystemd-shared.la + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-system/systemd-cgroups-agent/cgroups-agent.c b/src/grp-system/systemd-cgroups-agent/cgroups-agent.c new file mode 100644 index 0000000000..1475334fc1 --- /dev/null +++ b/src/grp-system/systemd-cgroups-agent/cgroups-agent.c @@ -0,0 +1,67 @@ +/*** + 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 . +***/ + +#include +#include + +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/socket-util.h" + +int main(int argc, char *argv[]) { + + static const union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + .un.sun_path = "/run/systemd/cgroups-agent", + }; + + _cleanup_close_ int fd = -1; + ssize_t n; + size_t l; + + if (argc != 2) { + log_error("Incorrect number of arguments."); + return EXIT_FAILURE; + } + + log_set_target(LOG_TARGET_AUTO); + log_parse_environment(); + log_open(); + + fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0); + if (fd < 0) { + log_debug_errno(errno, "Failed to allocate socket: %m"); + return EXIT_FAILURE; + } + + l = strlen(argv[1]); + + n = sendto(fd, argv[1], l, 0, &sa.sa, SOCKADDR_UN_LEN(sa.un)); + if (n < 0) { + log_debug_errno(errno, "Failed to send cgroups agent message: %m"); + return EXIT_FAILURE; + } + + if ((size_t) n != l) { + log_debug("Datagram size mismatch"); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile deleted file mode 100644 index ae40bb0163..0000000000 --- a/src/systemd-cgroups-agent/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile; indent-tabs-mode: t -*- -# -# This file is part of systemd. -# -# Copyright 2010-2012 Lennart Poettering -# Copyright 2010-2012 Kay Sievers -# Copyright 2013 Zbigniew Jędrzejewski-Szmek -# Copyright 2013 David Strauss -# Copyright 2016 Luke Shumaker -# -# 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 . -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk -include $(topsrcdir)/build-aux/Makefile.head.mk - -rootlibexec_PROGRAMS += systemd-cgroups-agent -systemd_cgroups_agent_SOURCES = \ - src/cgroups-agent/cgroups-agent.c - -systemd_cgroups_agent_LDADD = \ - libsystemd-shared.la - -include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-cgroups-agent/cgroups-agent.c b/src/systemd-cgroups-agent/cgroups-agent.c deleted file mode 100644 index 1475334fc1..0000000000 --- a/src/systemd-cgroups-agent/cgroups-agent.c +++ /dev/null @@ -1,67 +0,0 @@ -/*** - 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 . -***/ - -#include -#include - -#include "systemd-basic/fd-util.h" -#include "systemd-basic/log.h" -#include "systemd-basic/socket-util.h" - -int main(int argc, char *argv[]) { - - static const union sockaddr_union sa = { - .un.sun_family = AF_UNIX, - .un.sun_path = "/run/systemd/cgroups-agent", - }; - - _cleanup_close_ int fd = -1; - ssize_t n; - size_t l; - - if (argc != 2) { - log_error("Incorrect number of arguments."); - return EXIT_FAILURE; - } - - log_set_target(LOG_TARGET_AUTO); - log_parse_environment(); - log_open(); - - fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0); - if (fd < 0) { - log_debug_errno(errno, "Failed to allocate socket: %m"); - return EXIT_FAILURE; - } - - l = strlen(argv[1]); - - n = sendto(fd, argv[1], l, 0, &sa.sa, SOCKADDR_UN_LEN(sa.un)); - if (n < 0) { - log_debug_errno(errno, "Failed to send cgroups agent message: %m"); - return EXIT_FAILURE; - } - - if ((size_t) n != l) { - log_debug("Datagram size mismatch"); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} -- cgit v1.2.3-54-g00ecf