nspawn: remove nspawn.h, it's empty now

diff --git a/Makefile.am b/Makefile.am
index 3e4000819c1153454a5fa41494a4c52ce06d0c12..1dfa0c0677750e57af4ca866529c57713d3ec076 100644 (file)
--- 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 cfb4827de5b593bdf0369bb99ef5b8de00377ade..c0e9ccd7a44596e530d8010917540401c1f0873e 100644 (file)
--- 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 a6b8175e84ff14f39558bd9cd00d4bd30018169d..38250b6e02367a99d8e2e63cc0dcbff0ce9b93c9 100644 (file)
--- 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 e0f05547f34e2439850ecba62080ce0a6c0c2dc7..074b38030622690081289aa7e76bd259d070e743 100644 (file)
--- 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 5521e1bbe0ae2932b22305d8b092351fa8cfe455..2bca39f45d2fb8a4f4c1e3d0eb81abb91960e1de 100644 (file)
--- 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 51ba8554e03adb362d62e1099382719f16bdc9f0..74abe5379a5d1d2d1d3a8f83091efb7ed07765a4 100644 (file)
--- 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 0f3a5d69c353a1f471eba2fecb2b0a8ee214c17b..b2776a61c26a2761fbc2ded117bc1a41f976c633 100644 (file)
--- 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 9a403a306816a1f0fc528295222de3e21553ca42..419f5d1c406473ed391e8d0552f8958a53a87a55 100644 (file)
--- 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 2e84be6889cd1952852d87c6e597f3b065c2b5b6..4cec40c1b7152fa0ae43bd8122492e406f2652bf 100644 (file)
--- 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 3da54c8dd2e02e08d6105eefa692e7c3fb6ee63d..eda7f62900ab75e83e75798bcd5fca02f7a09537 100644 (file)
--- 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 cdb699eaaab013c8120f60d027b8eb16bc798d46..5fac86842cf50337e7131b1c18412b2d34f8c817 100644 (file)
--- 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 (file)
index 33eaa7e..0000000
--- 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/>.
-***/