From 57f1b61b76525b29f94b48d6a49b0d764835d045 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 3 Feb 2021 22:37:40 +0100
Subject: =?UTF-8?q?shared:=20rename=20machine-image.[ch]=20=E2=86=92=20dis?=
 =?UTF-8?q?cover-image.[ch]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 src/portable/portable.c            | 2 +-
 src/portable/portablectl.c         | 2 +-
 src/portable/portabled-bus.c       | 2 +-
 src/portable/portabled-image-bus.c | 2 +-
 src/portable/portabled-image-bus.h | 2 +-
 src/portable/portabled-image.h     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/portable')

diff --git a/src/portable/portable.c b/src/portable/portable.c
index d74e498d59..d18e03afd4 100644
--- 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 0b329134de..ee1c7b6965 100644
--- 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 cf50d58c71..20a33dc671 100644
--- 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 76b6ddebde..babdf4197f 100644
--- 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 aa2a3ade77..8442baf232 100644
--- 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 eeefffee64..753f389f80 100644
--- 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);
-- 
cgit v1.2.1