shared: Remove circular dependency between image-policy.h and dissect-image.h

ImagePolicy can just be a forward declaration in dissect-image.h.

diff --git a/src/analyze/analyze-image-policy.c b/src/analyze/analyze-image-policy.c
index df4f62f6b8d3c2d31721aa27810215bd0164df44..d18200a0624ebc5f9bd64cd837f9df19131e8d42 100644 (file)
--- a/src/analyze/analyze-image-policy.c
+++ b/src/analyze/analyze-image-policy.c
@@ -3,6 +3,7 @@
 #include "analyze-image-policy.h"
 #include "analyze.h"
 #include "format-table.h"
+#include "image-policy.h"
 #include "terminal-util.h"
 
 static int table_add_designator_line(Table *table, PartitionDesignator d, PartitionPolicyFlags f) {

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index d1619dbb635c28fe6591d94dc56861ae8781e27c..03abbc241d48baf1ba456e27df39115cca2bee23 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -65,6 +65,7 @@
 #include "format-table.h"
 #include "glob-util.h"
 #include "hashmap.h"
+#include "image-policy.h"
 #include "locale-util.h"
 #include "log.h"
 #include "main-func.h"

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 2e1527811ce9c0d859ef899291474f29da9c297e..3953e775ecd28c2940f1b2521133f6437d2abc72 100644 (file)
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -22,6 +22,7 @@
 #include "fileio.h"
 #include "hexdecoct.h"
 #include "hostname-util.h"
+#include "image-policy.h"
 #include "ioprio-util.h"
 #include "iovec-util.h"
 #include "journal-file.h"

diff --git a/src/core/exec-credential.c b/src/core/exec-credential.c
index 95ff1e45bb3ec4e3085626a8248c6f73cfb31090..bed7ff3672c81af6eb8366c401f415398cddd470 100644 (file)
--- a/src/core/exec-credential.c
+++ b/src/core/exec-credential.c
@@ -11,6 +11,7 @@
 #include "io-util.h"
 #include "iovec-util.h"
 #include "label-util.h"
+#include "log.h"
 #include "mkdir-label.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c
index 7b283eb485aced6ae6004d043f34d6dfdba667f6..f22aad76d275bae146b315273e5ce711065c9ea9 100644 (file)
--- a/src/core/exec-invoke.c
+++ b/src/core/exec-invoke.c
@@ -38,6 +38,7 @@
 #include "fd-util.h"
 #include "hexdecoct.h"
 #include "hostname-setup.h"
+#include "image-policy.h"
 #include "io-util.h"
 #include "ioprio-util.h"
 #include "iovec-util.h"

diff --git a/src/core/namespace.c b/src/core/namespace.c
index efdd93ddf9db912c77ea3f11a0d393ef2a0179ff..207f3a2d667e1ba7e6f782fc9be3787a38758661 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -22,6 +22,7 @@
 #include "label-util.h"
 #include "list.h"
 #include "lock-util.h"
+#include "log.h"
 #include "loop-util.h"
 #include "loopback-setup.h"
 #include "missing_syscall.h"

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index f01db21f88e0844eb91e4d9c16f547b2857f9ba1..f44fc706b21cb31ff0a3fefb9b1b5c2ee320b1b9 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -25,6 +25,7 @@
 #include "format-table.h"
 #include "fs-util.h"
 #include "glob-util.h"
+#include "image-policy.h"
 #include "journal-internal.h"
 #include "journal-util.h"
 #include "json-util.h"

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index e324af8cfc54d99172707ab55502b26f6b95664c..279b62bfd4516872568bb1f070c6b493cd74c2ee 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -26,6 +26,7 @@
 #include "fs-util.h"
 #include "glyph-util.h"
 #include "hostname-util.h"
+#include "image-policy.h"
 #include "kbd-util.h"
 #include "libcrypt-util.h"
 #include "locale-util.h"

diff --git a/src/home/homework-cifs.c b/src/home/homework-cifs.c
index e10ef9ccddd28049ae47e8d4ab5f4edcbe5cbc64..0cdf89f7684ca0372f9f79a66e17320c32bad011 100644 (file)
--- a/src/home/homework-cifs.c
+++ b/src/home/homework-cifs.c
@@ -9,6 +9,7 @@
 #include "fs-util.h"
 #include "homework-cifs.h"
 #include "homework-mount.h"
+#include "log.h"
 #include "memfd-util.h"
 #include "mkdir.h"
 #include "mount-util.h"

diff --git a/src/home/homework-directory.c b/src/home/homework-directory.c
index 37bdba30a3e8668fc9817ff9c43a718b9cbe2fbc..e471a4a92afb70fb3228a26235e06b994e252b58 100644 (file)
--- a/src/home/homework-directory.c
+++ b/src/home/homework-directory.c
@@ -8,6 +8,7 @@
 #include "homework-directory.h"
 #include "homework-mount.h"
 #include "homework-quota.h"
+#include "log.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "path-util.h"

diff --git a/src/home/homework-fscrypt.c b/src/home/homework-fscrypt.c
index 7574b5f9421e0cd45b878570861639863188299f..663138988a90f500c10040daaa124229b119b85e 100644 (file)
--- a/src/home/homework-fscrypt.c
+++ b/src/home/homework-fscrypt.c
@@ -12,6 +12,7 @@
 #include "homework-mount.h"
 #include "homework-quota.h"
 #include "keyring-util.h"
+#include "log.h"
 #include "memory-util.h"
 #include "missing_fs.h"
 #include "missing_keyctl.h"

diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c
index 52115d86be7a2c08350f9e426cc2d6c31b93e85a..7f027895c836a97d8ed1d604226e4d87be02c42e 100644 (file)
--- a/src/home/homework-mount.c
+++ b/src/home/homework-mount.c
@@ -10,6 +10,7 @@
 #include "home-util.h"
 #include "homework-mount.h"
 #include "homework.h"
+#include "log.h"
 #include "missing_syscall.h"
 #include "mkdir.h"
 #include "mount-util.h"

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 37cda775542582286bef792ed18873b53071da9e..400894e2a20cd096ee04a32b325befd662be1b7e 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -7,6 +7,7 @@
 #include "build.h"
 #include "glob-util.h"
 #include "id128-print.h"
+#include "image-policy.h"
 #include "journalctl.h"
 #include "journalctl-authenticate.h"
 #include "journalctl-catalog.h"

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index fa4ba6a037d77ef20699a86889fbd8f2834bcf07..956a538a7574e22bfc667939bb3e3b24891689d3 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -9,6 +9,7 @@
 #include "build.h"
 #include "dissect-image.h"
 #include "id128-util.h"
+#include "image-policy.h"
 #include "log.h"
 #include "machine-id-setup.h"
 #include "main-func.h"

diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c
index 3e69781572fe791371a819249f2363c10829d7d7..a6c99c83c6fadc8354096593d58ca7e95b2512d8 100644 (file)
--- a/src/nspawn/nspawn-mount.c
+++ b/src/nspawn/nspawn-mount.c
@@ -10,6 +10,7 @@
 #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"

diff --git a/src/repart/repart.c b/src/repart/repart.c
index f9aa9ac43ca7c8e5c822c0aa513006fda11eded4..c0fd1cc7bcff7d4b5febfe2aa15f79f5e66005e9 100644 (file)
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -45,6 +45,7 @@
 #include "hexdecoct.h"
 #include "hmac.h"
 #include "id128-util.h"
+#include "image-policy.h"
 #include "initrd-util.h"
 #include "io-util.h"
 #include "json-util.h"

diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h
index 3313d14921406ef8b6508bf1f8fd7d21db70c935..cae63969e50f7f20ab4de4d94bb204e81d1668fa 100644 (file)
--- a/src/shared/dissect-image.h
+++ b/src/shared/dissect-image.h
@@ -20,6 +20,7 @@ typedef struct DecryptedImage DecryptedImage;
 typedef struct MountOptions MountOptions;
 typedef struct VeritySettings VeritySettings;
 typedef struct ImageFilter ImageFilter;
+typedef struct ImagePolicy ImagePolicy;
 typedef struct ExtensionReleaseData ExtensionReleaseData;
 
 struct DissectedPartition {
@@ -163,9 +164,6 @@ struct ExtensionReleaseData {
         char *os_release_extension_scope;
 };
 
-/* We include image-policy.h down here, since ImagePolicy wants a complete definition of PartitionDesignator first. */
-#include "image-policy.h"
-
 MountOptions* mount_options_free_all(MountOptions *options);
 DEFINE_TRIVIAL_CLEANUP_FUNC(MountOptions*, mount_options_free_all);
 const char* mount_options_from_designator(const MountOptions *options, PartitionDesignator designator);

diff --git a/src/shared/fdisk-util.c b/src/shared/fdisk-util.c
index 368bec2b8b86a6aff34cdf44ba2659d69b492dca..3414572c31c364a2408173650f758b19d989bd47 100644 (file)
--- a/src/shared/fdisk-util.c
+++ b/src/shared/fdisk-util.c
@@ -5,6 +5,7 @@
 #include "extract-word.h"
 #include "fd-util.h"
 #include "fdisk-util.h"
+#include "log.h"
 #include "parse-util.h"
 
 #if HAVE_LIBFDISK

diff --git a/src/shared/image-policy.h b/src/shared/image-policy.h
index f61f55fd60a4c93911b5586d59c1dd7db5105e23..afb0d4fe9e9e4de36096c470a98752102c2b90ab 100644 (file)
--- a/src/shared/image-policy.h
+++ b/src/shared/image-policy.h
@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-typedef struct ImagePolicy ImagePolicy;
-
 #include "conf-parser.h"
 #include "dissect-image.h"
 #include "errno-list.h"
@@ -48,11 +46,11 @@ typedef struct PartitionPolicy {
         PartitionPolicyFlags flags;
 } PartitionPolicy;
 
-struct ImagePolicy {
+typedef struct ImagePolicy {
         PartitionPolicyFlags default_flags;  /* for any designator not listed in the list below */
         size_t n_policies;
         PartitionPolicy policies[];          /* sorted by designator, hence suitable for binary search */
-};
+} ImagePolicy;
 
 /* Default policies for various use cases */
 extern const ImagePolicy image_policy_allow;

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 46fa685b0d60bb5627111656a3f5b1f83e6c077e..c7385dac9af3596fbce37744bb2a445f9459921a 100644 (file)
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -8,6 +8,7 @@
 #include "fileio.h"
 #include "fs-util.h"
 #include "id128-util.h"
+#include "log.h"
 #include "mkfs-util.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"

diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c
index b836cebddeb3e5ff6295d1a3a539d9b6941a3977..25219e56ed4a9a4988591294354256b21a892f9a 100644 (file)
--- a/src/shared/mount-util.c
+++ b/src/shared/mount-util.c
@@ -22,6 +22,7 @@
 #include "initrd-util.h"
 #include "label-util.h"
 #include "libmount-util.h"
+#include "log.h"
 #include "missing_syscall.h"
 #include "mkdir-label.h"
 #include "mount-util.h"

diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index 6d7c78a97a6688959fa119d1af8393c05dec7c94..ba87a992bc7da6d07b30a301d5a16dae801cd290 100644 (file)
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -18,6 +18,7 @@
 #include "fs-util.h"
 #include "fstab-util.h"
 #include "libmount-util.h"
+#include "log.h"
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "mount-util.h"

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index bdd663a09412398e4985d09b5f29ef6f5b135532..2333019636feedaf77fb1254b9e4e5ba14f7d3c1 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -13,6 +13,7 @@
 #include "format-table.h"
 #include "glyph-util.h"
 #include "hexdecoct.h"
+#include "image-policy.h"
 #include "json-util.h"
 #include "main-func.h"
 #include "mount-util.h"

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index bb14c6c43b13bb2d1289fe07e93f088027ae3a78..bef806015e30908a15afc9ca6b5c5dab37670504 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -17,6 +17,7 @@
 #include "format-util.h"
 #include "fs-util.h"
 #include "hashmap.h"
+#include "image-policy.h"
 #include "libcrypt-util.h"
 #include "main-func.h"
 #include "memory-util.h"

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 98b524831c2b653e43b475125790200da76b9f5d..8ac320469a2e5485a47bfc7d20e614a04ef80b2a 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -39,6 +39,7 @@
 #include "fs-util.h"
 #include "glob-util.h"
 #include "hexdecoct.h"
+#include "image-policy.h"
 #include "io-util.h"
 #include "label-util.h"
 #include "log.h"