summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nspawn/nspawn-cgroup.c1
-rw-r--r--src/nspawn/nspawn-expose-ports.c1
-rw-r--r--src/nspawn/nspawn-gperf.gperf1
-rw-r--r--src/nspawn/nspawn-mount.c1
-rw-r--r--src/nspawn/nspawn-network.c1
-rw-r--r--src/nspawn/nspawn-register.c1
-rw-r--r--src/nspawn/nspawn-settings.c1
-rw-r--r--src/nspawn/nspawn-settings.h2
-rw-r--r--src/nspawn/nspawn-setuid.c1
-rw-r--r--src/nspawn/nspawn.c1
-rw-r--r--src/nspawn/nspawn.h22
11 files changed, 1 insertions, 32 deletions
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 <stddef.h>
#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 <stdio.h>
#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 <http://www.gnu.org/licenses/>.
-***/