summaryrefslogtreecommitdiff
path: root/src/machine
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-02-03 22:37:40 +0100
committerLennart Poettering <lennart@poettering.net>2021-02-03 23:12:57 +0100
commit57f1b61b76525b29f94b48d6a49b0d764835d045 (patch)
tree109a128d6aba61303db92c402d31e783f5748686 /src/machine
parent0fb613000de5e3ae343778290bed0ff9e9f741e4 (diff)
downloadsystemd-57f1b61b76525b29f94b48d6a49b0d764835d045.tar.gz
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.
Diffstat (limited to 'src/machine')
-rw-r--r--src/machine/image-dbus.c2
-rw-r--r--src/machine/machined-dbus.c2
-rw-r--r--src/machine/machined.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index f74cabd7fb..539b4c802a 100644
--- 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 a65f9b6a8e..08179eb400 100644
--- 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 6a5bf391e6..1d82059985 100644
--- 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"