shared: rename machine-image.[ch] → discover-image.[ch]

The old name originates when this was used to discover "machine" images,
as managed by machined/machinectl. But nowadays this is also used by
portable services and system extensions, hence let's use a more generic
name for this API. Taking inspiration from "dissect-image.[ch]", let's call
this "discover-image.[ch]".

This is pure renaming, no other changes.

diff --git a/src/import/export.c b/src/import/export.c
index 9c44fcf35cc746e19dd1dfeba31332f9a02eff73..5faf4ccc06b0516577f752c776369b59c22e72e5 100644 (file)
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -7,13 +7,13 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "export-raw.h"
 #include "export-tar.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"

diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index 1fe5a257dbd66b720b2b86b1e4a31494e719b000..a12ee77ef9fc7fb6bdc85ad9d15ed85d7449b4a3 100644 (file)
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -5,13 +5,13 @@
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-common.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "mkdir.h"
 #include "ratelimit.h"
 #include "rm-rf.h"

diff --git a/src/import/import.c b/src/import/import.c
index 934074a7b0abd22eba5d7611732bd96449106c53..661fa2888c58b41f5f1b39b9cf29cbb49b15b4b0 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -7,13 +7,13 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "hostname-util.h"
 #include "import-raw.h"
 #include "import-tar.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "signal-util.h"
 #include "string-util.h"

diff --git a/src/import/pull.c b/src/import/pull.c
index a54f968cd76eb2c8934f66408e1931487de0d501..dc0bf20201daec125f2b57f49b80ce2ee204138e 100644 (file)
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -7,9 +7,9 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "hostname-util.h"
 #include "import-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "parse-util.h"
 #include "pull-raw.h"

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index f74cabd7fb753a85ae4d1bdf247f9d73a0eeb7de..539b4c802a62e640c5f60d1c6207cb5198f179f5 100644 (file)
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -8,6 +8,7 @@
 #include "bus-label.h"
 #include "bus-polkit.h"
 #include "copy.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -15,7 +16,6 @@
 #include "image-dbus.h"
 #include "io-util.h"
 #include "loop-util.h"
-#include "machine-image.h"
 #include "missing_capability.h"
 #include "mount-util.h"
 #include "process-util.h"

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index a65f9b6a8e5628ea604504fd30c966ae2dfb6c07..08179eb4006cc277b01ad9155e09bd50d8f38490 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -12,6 +12,7 @@
 #include "bus-locator.h"
 #include "bus-polkit.h"
 #include "cgroup-util.h"
+#include "discover-image.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -20,7 +21,6 @@
 #include "image-dbus.h"
 #include "io-util.h"
 #include "machine-dbus.h"
-#include "machine-image.h"
 #include "machine-pool.h"
 #include "machined.h"
 #include "missing_capability.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 6a5bf391e6b24d477d302c215315e697210a3157..1d820599858298194af13d206e1f19ebe66ddc11 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -15,11 +15,11 @@
 #include "bus-polkit.h"
 #include "cgroup-util.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "format-util.h"
 #include "hostname-util.h"
 #include "label.h"
-#include "machine-image.h"
 #include "machined-varlink.h"
 #include "machined.h"
 #include "main-func.h"

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index aa3bcdb7a299ab50444e08f23a289481c3a60106..a702af8e3bd95af2b08d58cec04acce997e060c4 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -36,6 +36,7 @@
 #include "copy.h"
 #include "cpu-set-util.h"
 #include "dev-setup.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "env-util.h"
 #include "escape.h"
@@ -53,7 +54,6 @@
 #include "log.h"
 #include "loop-util.h"
 #include "loopback-setup.h"
-#include "machine-image.h"
 #include "macro.h"
 #include "main-func.h"
 #include "missing_sched.h"

diff --git a/src/portable/portable.c b/src/portable/portable.c
index d74e498d596d67f19e7a5c29eca892a6b0b75ee7..d18e03afd4fd1adf20cd94e196bc0ba788269c78 100644 (file)
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -8,6 +8,7 @@
 #include "copy.h"
 #include "def.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -16,7 +17,6 @@
 #include "io-util.h"
 #include "locale-util.h"
 #include "loop-util.h"
-#include "machine-image.h"
 #include "mkdir.h"
 #include "nulstr-util.h"
 #include "os-util.h"

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 0b329134de5926ca64206b1c18e72babef97f08c..ee1c7b696510f2844369f8e45570006509ab2d24 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -12,13 +12,13 @@
 #include "bus-wait-for-jobs.h"
 #include "def.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-table.h"
 #include "fs-util.h"
 #include "locale-util.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "pager.h"
 #include "parse-util.h"

diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c
index cf50d58c71dff5da8e53b9b805456ace19920d05..20a33dc6716c0931a11b19208389cf5ccad68f59 100644 (file)
--- a/src/portable/portabled-bus.c
+++ b/src/portable/portabled-bus.c
@@ -4,9 +4,9 @@
 #include "btrfs-util.h"
 #include "bus-common-errors.h"
 #include "bus-polkit.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "io-util.h"
-#include "machine-image.h"
 #include "missing_capability.h"
 #include "portable.h"
 #include "portabled-bus.h"

diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 76b6ddebde374068beb41508f0b79ffd67e79abf..babdf4197fa51383d6d333ba0bfff2bc997b6a1d 100644 (file)
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -11,10 +11,10 @@
 #include "bus-label.h"
 #include "bus-polkit.h"
 #include "bus-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "io-util.h"
-#include "machine-image.h"
 #include "missing_capability.h"
 #include "portable.h"
 #include "portabled-bus.h"

diff --git a/src/portable/portabled-image-bus.h b/src/portable/portabled-image-bus.h
index aa2a3ade7706723c1f4edb6f6e0460026ed73ab0..8442baf232c0753c7ea0e62750bc7f71890c47a0 100644 (file)
--- a/src/portable/portabled-image-bus.h
+++ b/src/portable/portabled-image-bus.h
@@ -3,7 +3,7 @@
 
 #include "sd-bus.h"
 
-#include "machine-image.h"
+#include "discover-image.h"
 #include "portabled.h"
 
 int bus_image_common_get_os_release(Manager *m, sd_bus_message *message, const char *name_or_path, Image *image, sd_bus_error *error);

diff --git a/src/portable/portabled-image.h b/src/portable/portabled-image.h
index eeefffee64e3180d214bdd8d45e1b0db9cfcaa2b..753f389f80d24df8a6181748ba54cd99709a7086 100644 (file)
--- a/src/portable/portabled-image.h
+++ b/src/portable/portabled-image.h
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include "discover-image.h"
 #include "hashmap.h"
-#include "machine-image.h"
 #include "portabled.h"
 
 Image *manager_image_cache_get(Manager *m, const char *name_or_path);

diff --git a/src/shared/machine-image.c b/src/shared/discover-image.c
similarity index 99%
rename from src/shared/machine-image.c
rename to src/shared/discover-image.c
index d2b726efc4c4a6f45eaa63bc468fa8dc2d93b1a7..851d1edabb7d426d63a15748709cc78283fb5475 100644 (file)
--- a/src/shared/machine-image.c
+++ b/src/shared/discover-image.c
@@ -16,6 +16,7 @@
 #include "chattr-util.h"
 #include "copy.h"
 #include "dirent-util.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "env-file.h"
 #include "env-util.h"
@@ -27,7 +28,6 @@
 #include "lockfile-util.h"
 #include "log.h"
 #include "loop-util.h"
-#include "machine-image.h"
 #include "macro.h"
 #include "mkdir.h"
 #include "nulstr-util.h"

diff --git a/src/shared/machine-image.h b/src/shared/discover-image.h
similarity index 100%
rename from src/shared/machine-image.h
rename to src/shared/discover-image.h

diff --git a/src/shared/meson.build b/src/shared/meson.build
index f301a9f610d107d3be65ed1f1a1ca0c862b5fc5d..b1a8ea9ac64a941447cd0068bd2d03af78e730a0 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -79,6 +79,8 @@ shared_sources = files('''
         dev-setup.c
         dev-setup.h
         devnode-acl.h
+        discover-image.c
+        discover-image.h
         dissect-image.c
         dissect-image.h
         dm-util.c
@@ -172,8 +174,6 @@ shared_sources = files('''
         loopback-setup.h
         machine-id-setup.c
         machine-id-setup.h
-        machine-image.c
-        machine-image.h
         machine-pool.c
         machine-pool.h
         macvlan-util.c

diff --git a/src/shared/os-util.c b/src/shared/os-util.c
index d1cf41283b1b6768dc1b27b3fffc52bbf9e9d1a5..45c10ca9c5600812b686a5be6a63553d2e1472d7 100644 (file)
--- a/src/shared/os-util.c
+++ b/src/shared/os-util.c
@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
+#include "discover-image.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"
 #include "macro.h"
-#include "machine-image.h"
 #include "os-util.h"
 #include "string-util.h"
 #include "strv.h"

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 601fd63a1442a573c816ce02e21546eb12f39dc8..ee38e49ec92da73c1c2638531b5f8481088be006 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "capability-util.h"
+#include "discover-image.h"
 #include "dissect-image.h"
 #include "escape.h"
 #include "fd-util.h"
@@ -14,7 +15,6 @@
 #include "fs-util.h"
 #include "hashmap.h"
 #include "log.h"
-#include "machine-image.h"
 #include "main-func.h"
 #include "missing_magic.h"
 #include "mkdir.h"

diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index e25cf9e5d91287727ad6da85d4c76557ca0955ac..641cadec858b20ae54cc9f18980387ff0a7bc30a 100644 (file)
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -8,6 +8,7 @@
 #include "condition.h"
 #include "device-private.h"
 #include "device.h"
+#include "discover-image.h"
 #include "execute.h"
 #include "import-util.h"
 #include "install.h"
@@ -18,7 +19,6 @@
 #include "locale-util.h"
 #include "log.h"
 #include "logs-show.h"
-#include "machine-image.h"
 #include "mount.h"
 #include "path.h"
 #include "process-util.h"