From 7a8f63251df2202e59a76e537a688fe7500cb1ad Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2015 16:52:24 +0200 Subject: nspawn: split all port exposure code into nspawn-expose-port.[ch] --- src/nspawn/nspawn-gperf.gperf | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nspawn/nspawn-gperf.gperf') diff --git a/src/nspawn/nspawn-gperf.gperf b/src/nspawn/nspawn-gperf.gperf index 8b68dfa9f5..e0f05547f3 100644 --- a/src/nspawn/nspawn-gperf.gperf +++ b/src/nspawn/nspawn-gperf.gperf @@ -3,6 +3,7 @@ #include "conf-parser.h" #include "nspawn.h" #include "nspawn-settings.h" +#include "nspawn-expose-ports.h" %} struct ConfigPerfItem; %null_strings -- cgit v1.2.3-54-g00ecf From 2b5c04d59cf3442791aff49013921acb68eb9fc6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 7 Sep 2015 18:47:34 +0200 Subject: nspawn: remove nspawn.h, it's empty now --- Makefile.am | 1 - src/nspawn/nspawn-cgroup.c | 1 - src/nspawn/nspawn-expose-ports.c | 1 - src/nspawn/nspawn-gperf.gperf | 1 - src/nspawn/nspawn-mount.c | 1 - src/nspawn/nspawn-network.c | 1 - src/nspawn/nspawn-register.c | 1 - src/nspawn/nspawn-settings.c | 1 - src/nspawn/nspawn-settings.h | 2 +- src/nspawn/nspawn-setuid.c | 1 - src/nspawn/nspawn.c | 1 - src/nspawn/nspawn.h | 22 ---------------------- 12 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/nspawn/nspawn.h (limited to 'src/nspawn/nspawn-gperf.gperf') diff --git a/Makefile.am b/Makefile.am index 3e4000819c..1dfa0c0677 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2778,7 +2778,6 @@ systemd_cgtop_LDADD = \ # ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn/nspawn.c \ - src/nspawn/nspawn.h \ src/nspawn/nspawn-settings.c \ src/nspawn/nspawn-settings.h \ src/nspawn/nspawn-mount.c \ diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index cfb4827de5..c0e9ccd7a4 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -27,7 +27,6 @@ #include "fileio.h" #include "cgroup-util.h" -#include "nspawn.h" #include "nspawn-cgroup.h" int chown_cgroup(pid_t pid, uid_t uid_shift) { diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c index a6b8175e84..38250b6e02 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/nspawn/nspawn-expose-ports.c @@ -27,7 +27,6 @@ #include "local-addresses.h" #include "netlink-util.h" -#include "nspawn.h" #include "nspawn-expose-ports.h" int expose_port_parse(ExposePort **l, const char *s) { diff --git a/src/nspawn/nspawn-gperf.gperf b/src/nspawn/nspawn-gperf.gperf index e0f05547f3..074b380306 100644 --- a/src/nspawn/nspawn-gperf.gperf +++ b/src/nspawn/nspawn-gperf.gperf @@ -1,7 +1,6 @@ %{ #include #include "conf-parser.h" -#include "nspawn.h" #include "nspawn-settings.h" #include "nspawn-expose-ports.h" %} diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 5521e1bbe0..2bca39f45d 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -30,7 +30,6 @@ #include "set.h" #include "cgroup-util.h" -#include "nspawn.h" #include "nspawn-mount.h" CustomMount* custom_mount_add(CustomMount **l, unsigned *n, CustomMountType t) { diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 51ba8554e0..74abe5379a 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -32,7 +32,6 @@ #include "netlink-util.h" #include "udev-util.h" -#include "nspawn.h" #include "nspawn-network.h" #define HOST_HASH_KEY SD_ID128_MAKE(1a,37,6f,c7,46,ec,45,0b,ad,a3,d5,31,06,60,5d,b1) diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c index 0f3a5d69c3..b2776a61c2 100644 --- a/src/nspawn/nspawn-register.c +++ b/src/nspawn/nspawn-register.c @@ -26,7 +26,6 @@ #include "bus-util.h" #include "bus-error.h" -#include "nspawn.h" #include "nspawn-register.h" int register_machine( diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index 9a403a3068..419f5d1c40 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -24,7 +24,6 @@ #include "strv.h" #include "cap-list.h" -#include "nspawn.h" #include "nspawn-settings.h" int settings_load(FILE *f, const char *path, Settings **ret) { diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h index 2e84be6889..4cec40c1b7 100644 --- a/src/nspawn/nspawn-settings.h +++ b/src/nspawn/nspawn-settings.h @@ -24,7 +24,7 @@ #include #include "macro.h" -#include "nspawn.h" + #include "nspawn-mount.h" #include "nspawn-expose-ports.h" diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c index 3da54c8dd2..eda7f62900 100644 --- a/src/nspawn/nspawn-setuid.c +++ b/src/nspawn/nspawn-setuid.c @@ -28,7 +28,6 @@ #include "mkdir.h" #include "process-util.h" -#include "nspawn.h" #include "nspawn-setuid.h" static int spawn_getent(const char *database, const char *key, pid_t *rpid) { diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index cdb699eaaa..5fac86842c 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -96,7 +96,6 @@ #include "seccomp-util.h" #endif -#include "nspawn.h" #include "nspawn-settings.h" #include "nspawn-mount.h" #include "nspawn-network.h" diff --git a/src/nspawn/nspawn.h b/src/nspawn/nspawn.h deleted file mode 100644 index 33eaa7e9d1..0000000000 --- a/src/nspawn/nspawn.h +++ /dev/null @@ -1,22 +0,0 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - -#pragma once - -/*** - This file is part of systemd. - - Copyright 2015 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 . -***/ -- cgit v1.2.3-54-g00ecf