diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-02-03 22:37:40 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-02-03 23:12:57 +0100 |
| commit | 57f1b61b76525b29f94b48d6a49b0d764835d045 (patch) | |
| tree | 109a128d6aba61303db92c402d31e783f5748686 /src/shared | |
| parent | 0fb613000de5e3ae343778290bed0ff9e9f741e4 (diff) | |
| download | systemd-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/shared')
| -rw-r--r-- | src/shared/discover-image.c (renamed from src/shared/machine-image.c) | 2 | ||||
| -rw-r--r-- | src/shared/discover-image.h (renamed from src/shared/machine-image.h) | 0 | ||||
| -rw-r--r-- | src/shared/meson.build | 4 | ||||
| -rw-r--r-- | src/shared/os-util.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/machine-image.c b/src/shared/discover-image.c index d2b726efc4..851d1edabb 100644 --- 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 index c568fff751..c568fff751 100644 --- a/src/shared/machine-image.h +++ b/src/shared/discover-image.h diff --git a/src/shared/meson.build b/src/shared/meson.build index f301a9f610..b1a8ea9ac6 100644 --- 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 d1cf41283b..45c10ca9c5 100644 --- 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" |