From: Daan De Meyer Date: Wed, 21 May 2025 11:56:51 +0000 (+0200) Subject: nspawn: Clean up includes X-Git-Tag: v258-rc1~552 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ee31a53a9f6f7a721a9849b76c873873482c49b;p=thirdparty%2Fsystemd.git nspawn: Clean up includes Split out of #37344. --- diff --git a/src/nspawn/fuzz-nspawn-oci.c b/src/nspawn/fuzz-nspawn-oci.c index daa478e83cc..ceb17275ca9 100644 --- a/src/nspawn/fuzz-nspawn-oci.c +++ b/src/nspawn/fuzz-nspawn-oci.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "alloc-util.h" #include "fd-util.h" #include "fuzz.h" #include "nspawn-oci.h" diff --git a/src/nspawn/fuzz-nspawn-settings.c b/src/nspawn/fuzz-nspawn-settings.c index e45bfd8fdd8..2da93999be1 100644 --- a/src/nspawn/fuzz-nspawn-settings.c +++ b/src/nspawn/fuzz-nspawn-settings.c @@ -1,6 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include "alloc-util.h" #include "fd-util.h" #include "fuzz.h" #include "nspawn-settings.h" diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c index d142ec58037..da927347c6a 100644 --- a/src/nspawn/nspawn-bind-user.c +++ b/src/nspawn/nspawn-bind-user.c @@ -1,5 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include +#include +#include + #include "alloc-util.h" #include "chase.h" #include "fd-util.h" @@ -7,9 +11,12 @@ #include "format-util.h" #include "json-util.h" #include "log.h" +#include "nspawn-mount.h" #include "nspawn.h" #include "nspawn-bind-user.h" #include "path-util.h" +#include "string-util.h" +#include "strv.h" #include "user-util.h" #include "userdb.h" diff --git a/src/nspawn/nspawn-bind-user.h b/src/nspawn/nspawn-bind-user.h index 1ee0597b412..b6d4e1e4ad0 100644 --- a/src/nspawn/nspawn-bind-user.h +++ b/src/nspawn/nspawn-bind-user.h @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include "group-record.h" -#include "nspawn-mount.h" -#include "user-record.h" +#include "forward.h" + +typedef struct CustomMount CustomMount; typedef struct BindUserData { /* The host's user/group records */ diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index 9ec6f277b9a..98450b6f1dc 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -1,14 +1,14 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include #include "alloc-util.h" #include "cgroup-setup.h" #include "chase.h" #include "fd-util.h" #include "format-util.h" -#include "fs-util.h" -#include "mkdir.h" +#include "log.h" #include "mount-setup.h" #include "mount-util.h" #include "mountpoint-util.h" @@ -16,6 +16,7 @@ #include "nsresource.h" #include "path-util.h" #include "string-util.h" +#include "strv.h" static int chown_cgroup_path(const char *path, uid_t uid_shift) { _cleanup_close_ int fd = -EBADF; diff --git a/src/nspawn/nspawn-cgroup.h b/src/nspawn/nspawn-cgroup.h index 125bbf5f803..57c97377288 100644 --- a/src/nspawn/nspawn-cgroup.h +++ b/src/nspawn/nspawn-cgroup.h @@ -1,9 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include - +#include "forward.h" #include "nspawn-settings.h" int create_subcgroup( diff --git a/src/nspawn/nspawn-expose-ports.c b/src/nspawn/nspawn-expose-ports.c index 56440684467..9a194089da4 100644 --- a/src/nspawn/nspawn-expose-ports.c +++ b/src/nspawn/nspawn-expose-ports.c @@ -8,7 +8,7 @@ #include "firewall-util.h" #include "in-addr-util.h" #include "local-addresses.h" -#include "netlink-util.h" +#include "log.h" #include "nspawn-expose-ports.h" #include "parse-util.h" #include "socket-util.h" diff --git a/src/nspawn/nspawn-expose-ports.h b/src/nspawn/nspawn-expose-ports.h index 27cfccf0152..4f1ecc22991 100644 --- a/src/nspawn/nspawn-expose-ports.h +++ b/src/nspawn/nspawn-expose-ports.h @@ -1,13 +1,8 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include - -#include "sd-event.h" -#include "sd-netlink.h" - #include "firewall-util.h" -#include "in-addr-util.h" +#include "forward.h" #include "list.h" typedef struct ExposePort { diff --git a/src/nspawn/nspawn-gperf.gperf b/src/nspawn/nspawn-gperf.gperf index 4356e0f4fad..883ca97bc89 100644 --- a/src/nspawn/nspawn-gperf.gperf +++ b/src/nspawn/nspawn-gperf.gperf @@ -7,7 +7,6 @@ _Pragma("GCC diagnostic ignored \"-Wzero-as-null-pointer-constant\"") #include #include "conf-parser.h" #include "nspawn-settings.h" -#include "nspawn-expose-ports.h" %} struct ConfigPerfItem; %null_strings diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index d1a9ced8ea4..96647b5ae49 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -6,26 +6,23 @@ #include "alloc-util.h" #include "chase.h" #include "escape.h" +#include "extract-word.h" #include "fd-util.h" #include "format-util.h" #include "fs-util.h" -#include "label-util.h" #include "log.h" #include "mkdir-label.h" #include "mount-util.h" #include "mountpoint-util.h" #include "namespace-util.h" #include "nspawn-mount.h" -#include "parse-util.h" #include "path-util.h" #include "rm-rf.h" -#include "set.h" #include "sort-util.h" #include "stat-util.h" #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -#include "user-util.h" CustomMount* custom_mount_add(CustomMount **l, size_t *n, CustomMountType t) { CustomMount *ret; diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h index a1819f08373..26b2380dcb9 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/nspawn/nspawn-mount.h @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include -#include - +#include "forward.h" #include "volatile-util.h" typedef enum MountSettingsMask { diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index f29dfc0f5a3..afd5294d04a 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -17,20 +17,14 @@ #include "ether-addr-util.h" #include "extract-word.h" #include "fd-util.h" -#include "hexdecoct.h" #include "lock-util.h" -#include "missing_network.h" #include "mkdir.h" #include "mount-util.h" #include "namespace-util.h" -#include "netif-naming-scheme.h" #include "netif-util.h" #include "netlink-util.h" #include "nspawn-network.h" -#include "parse-util.h" #include "process-util.h" -#include "siphash24.h" -#include "socket-netlink.h" #include "socket-util.h" #include "stat-util.h" #include "string-util.h" diff --git a/src/nspawn/nspawn-network.h b/src/nspawn/nspawn-network.h index ed08c983472..4bf3dab52b4 100644 --- a/src/nspawn/nspawn-network.h +++ b/src/nspawn/nspawn-network.h @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include -#include +#include -#include "ether-addr-util.h" +#include "forward.h" int test_network_interfaces_initialized(char **iface_pairs); int resolve_network_interface_names(char **iface_pairs); diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c index 430af7b8a23..f891ea07420 100644 --- a/src/nspawn/nspawn-oci.c +++ b/src/nspawn/nspawn-oci.c @@ -1,29 +1,28 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include +#include +#include "sd-bus.h" #include "sd-json.h" #include "alloc-util.h" #include "bus-util.h" #include "cap-list.h" +#include "cgroup-util.h" #include "cpu-set-util.h" #include "device-util.h" #include "devnum-util.h" #include "env-util.h" -#include "format-util.h" -#include "fs-util.h" #include "hostname-util.h" #include "json-util.h" -#include "missing_sched.h" +#include "nspawn-mount.h" #include "nspawn-oci.h" #include "path-util.h" #include "rlimit-util.h" -#include "seccomp-util.h" -#include "stdio-util.h" #include "string-util.h" #include "strv.h" -#include "user-util.h" +#include "time-util.h" /* TODO: * OCI runtime tool implementation diff --git a/src/nspawn/nspawn-oci.h b/src/nspawn/nspawn-oci.h index ee72c917321..cb97c33853d 100644 --- a/src/nspawn/nspawn-oci.h +++ b/src/nspawn/nspawn-oci.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "forward.h" #include "nspawn-settings.h" int oci_load(FILE *f, const char *path, Settings **ret); diff --git a/src/nspawn/nspawn-register.c b/src/nspawn/nspawn-register.c index 36cd2066e54..e2350e5267a 100644 --- a/src/nspawn/nspawn-register.c +++ b/src/nspawn/nspawn-register.c @@ -8,11 +8,14 @@ #include "bus-unit-util.h" #include "bus-util.h" #include "bus-wait-for-jobs.h" +#include "nspawn-mount.h" #include "nspawn-register.h" #include "nspawn-settings.h" +#include "pidref.h" #include "special.h" #include "stat-util.h" -#include "strv.h" +#include "string-util.h" +#include "unit-name.h" static int append_machine_properties( sd_bus_message *m, diff --git a/src/nspawn/nspawn-register.h b/src/nspawn/nspawn-register.h index 89e35f02a78..83c134dc6e6 100644 --- a/src/nspawn/nspawn-register.h +++ b/src/nspawn/nspawn-register.h @@ -1,11 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include - -#include "sd-id128.h" - -#include "nspawn-mount.h" +#include "forward.h" #include "nspawn-settings.h" typedef enum RegisterMachineFlags { diff --git a/src/nspawn/nspawn-seccomp.c b/src/nspawn/nspawn-seccomp.c index e7d18a317ee..710c874ddd2 100644 --- a/src/nspawn/nspawn-seccomp.c +++ b/src/nspawn/nspawn-seccomp.c @@ -1,16 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include +#include #include -#include #include -#include -#include "alloc-util.h" #include "log.h" #include "nspawn-seccomp.h" #include "seccomp-util.h" -#include "string-util.h" #include "strv.h" #if HAVE_SECCOMP diff --git a/src/nspawn/nspawn-seccomp.h b/src/nspawn/nspawn-seccomp.h index a2fa9a61c65..03c378505d2 100644 --- a/src/nspawn/nspawn-seccomp.h +++ b/src/nspawn/nspawn-seccomp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include +#include "forward.h" int setup_seccomp(uint64_t cap_list_retain, char **syscall_allow_list, char **syscall_deny_list); diff --git a/src/nspawn/nspawn-settings.c b/src/nspawn/nspawn-settings.c index 2d883e21968..7c04bf6147c 100644 --- a/src/nspawn/nspawn-settings.c +++ b/src/nspawn/nspawn-settings.c @@ -1,11 +1,15 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ +#include "sd-bus.h" + #include "alloc-util.h" #include "cap-list.h" #include "conf-parser.h" #include "cpu-set-util.h" -#include "hostname-util.h" +#include "extract-word.h" #include "namespace-util.h" +#include "nspawn-expose-ports.h" +#include "nspawn-mount.h" #include "nspawn-network.h" #include "nspawn-settings.h" #include "parse-util.h" diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h index e057fc123d8..f1c43f50f72 100644 --- a/src/nspawn/nspawn-settings.h +++ b/src/nspawn/nspawn-settings.h @@ -1,21 +1,18 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include - -#include "sd-bus.h" #include "sd-id128.h" #include "capability-util.h" -#include "conf-parser.h" +#include "conf-parser-forward.h" #include "cpu-set-util.h" -#include "macro.h" -#include "nspawn-expose-ports.h" -#include "nspawn-mount.h" +#include "forward.h" #include "rlimit-util.h" #include "seccomp-util.h" -#include "time-util.h" +#include "volatile-util.h" + +typedef struct CustomMount CustomMount; +typedef struct ExposePort ExposePort; typedef enum StartMode { START_PID1, /* Run parameters as command line as process 1 */ diff --git a/src/nspawn/nspawn-setuid.c b/src/nspawn/nspawn-setuid.c index 51db3cade34..342a9b9212e 100644 --- a/src/nspawn/nspawn-setuid.c +++ b/src/nspawn/nspawn-setuid.c @@ -1,11 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include -#include #include #include "alloc-util.h" -#include "constants.h" #include "errno.h" #include "extract-word.h" #include "fd-util.h" @@ -14,7 +12,6 @@ #include "mkdir.h" #include "nspawn-setuid.h" #include "process-util.h" -#include "signal-util.h" #include "string-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/nspawn/nspawn-setuid.h b/src/nspawn/nspawn-setuid.h index 2dc9a696065..740375a43e7 100644 --- a/src/nspawn/nspawn-setuid.h +++ b/src/nspawn/nspawn-setuid.h @@ -1,8 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include -#include +#include "forward.h" int change_uid_gid_raw(uid_t uid, gid_t gid, const gid_t *supplementary_gids, size_t n_supplementary_gids, bool chown_stdio); int change_uid_gid(const char *user, bool chown_stdio, char **ret_home); diff --git a/src/nspawn/nspawn-stub-pid1.h b/src/nspawn/nspawn-stub-pid1.h index e0810fee12e..c7889583f4c 100644 --- a/src/nspawn/nspawn-stub-pid1.h +++ b/src/nspawn/nspawn-stub-pid1.h @@ -3,4 +3,6 @@ #include "sd-id128.h" +#include "forward.h" + int stub_pid1(sd_id128_t uuid); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 33397fd7597..c89f8723e65 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1,20 +1,17 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#include #include -#include -#include #include +#include #include #include #include #include #include #include -#include #include -#include #include +#include "constants.h" #if HAVE_SELINUX #include @@ -22,7 +19,9 @@ #include "sd-bus.h" #include "sd-daemon.h" +#include "sd-event.h" #include "sd-id128.h" +#include "sd-netlink.h" #include "alloc-util.h" #include "barrier.h" @@ -37,7 +36,6 @@ #include "cgroup-setup.h" #include "cgroup-util.h" #include "chase.h" -#include "chattr-util.h" #include "common-signal.h" #include "copy.h" #include "cpu-set-util.h" @@ -48,29 +46,33 @@ #include "env-util.h" #include "escape.h" #include "ether-addr-util.h" +#include "extract-word.h" #include "fd-util.h" #include "fdset.h" #include "fileio.h" #include "format-util.h" #include "fs-util.h" #include "gpt.h" +#include "group-record.h" #include "hexdecoct.h" #include "hostname-setup.h" #include "hostname-util.h" #include "id128-util.h" +#include "image-policy.h" +#include "in-addr-util.h" #include "io-util.h" #include "log.h" #include "loop-util.h" #include "loopback-setup.h" #include "machine-credential.h" -#include "macro.h" #include "main-func.h" +#include "missing_keyctl.h" +#include "missing_syscall.h" #include "mkdir.h" #include "mount-util.h" #include "mountpoint-util.h" #include "namespace-util.h" #include "notify-recv.h" -#include "nspawn.h" #include "nspawn-bind-user.h" #include "nspawn-cgroup.h" #include "nspawn-expose-ports.h" @@ -82,13 +84,15 @@ #include "nspawn-settings.h" #include "nspawn-setuid.h" #include "nspawn-stub-pid1.h" +#include "nspawn.h" #include "nsresource.h" -#include "nulstr-util.h" #include "os-util.h" #include "osc-context.h" #include "pager.h" #include "parse-argument.h" #include "parse-util.h" +#include "path-util.h" +#include "pidref.h" #include "pretty-print.h" #include "process-util.h" #include "ptyfwd.h" @@ -97,9 +101,11 @@ #include "resolve-util.h" #include "rlimit-util.h" #include "rm-rf.h" +#include "runtime-scope.h" #include "seccomp-util.h" #include "shift-uid.h" #include "signal-util.h" +#include "siphash24.h" #include "socket-util.h" #include "stat-util.h" #include "stdio-util.h" @@ -112,6 +118,7 @@ #include "uid-classification.h" #include "umask-util.h" #include "unit-name.h" +#include "user-record.h" #include "user-util.h" #include "vpick.h" diff --git a/src/nspawn/nspawn.h b/src/nspawn/nspawn.h index 556f8ee1aff..8f1e812087e 100644 --- a/src/nspawn/nspawn.h +++ b/src/nspawn/nspawn.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once -#include +#include "forward.h" int userns_lchown(const char *p, uid_t uid, gid_t gid); int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid_t gid);