SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18459 from poettering/discover-image

Browse Source 
shared: rename machine-image.[ch] → discover-image.[ch]
This commit is contained in:
Yu Watanabe
2021-02-04 13:57:37 +09:00
committed by GitHub
parent 2ef2376d83 99d97afcec
commit 245f4b384d
20 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/import/export.c
+1 -1
View File
@@ -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"
src/import/import-fs.c
+1 -1
View File
@@ -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"
src/import/import.c
+1 -1
View File
@@ -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"
src/import/pull.c
+1 -1
View File
@@ -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"
src/machine/image-dbus.c
+1 -1
View File
@@ -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"
src/machine/machined-dbus.c
+1 -1
View File
@@ -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"
src/machine/machined.c
+1 -1
View File
@@ -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"
src/nspawn/nspawn.c
+1 -1
View File
@@ -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"
src/portable/portable.c
+1 -1
View File
@@ -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"
src/portable/portablectl.c
+1 -1
View File
@@ -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"
src/portable/portabled-bus.c
+1 -1
View File
@@ -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"
src/portable/portabled-image-bus.c
+1 -1
View File
@@ -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"
src/portable/portabled-image-bus.h
+1 -1
View File
@@ -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);
src/portable/portabled-image.h
+1 -1
View File
@@ -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);
src/shared/machine-image.c → src/shared/discover-image.c
+8 -6
View File
@@ -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"
@@ -1065,7 +1065,6 @@ int image_path_lock(const char *path, int operation, LockFile *global, LockFile
r = asprintf(&p, "/run/systemd/nspawn/locks/inode-%lu:%lu", (unsigned long) st.st_dev, (unsigned long) st.st_ino);
else
return -ENOTTY;
if (r < 0)
return -ENOMEM;
}
@@ -1220,11 +1219,16 @@ int image_read_metadata(Image *i) {
}
int image_name_lock(const char *name, int operation, LockFile *ret) {
const char *p;
assert(name);
assert(ret);
/* Locks an image name, regardless of the precise path used. */
if (streq(name, ".host"))
return -EBUSY;
if (!image_name_is_valid(name))
return -EINVAL;
@@ -1233,11 +1237,9 @@ int image_name_lock(const char *name, int operation, LockFile *ret) {
return 0;
}
if (streq(name, ".host"))
return -EBUSY;
const char *p = strjoina("/run/systemd/nspawn/locks/name-", name);
(void) mkdir_p("/run/systemd/nspawn/locks", 0700);
p = strjoina("/run/systemd/nspawn/locks/name-", name);
return make_lock_file(p, operation, ret);
}
src/shared/machine-image.h → src/shared/discover-image.h
View File
src/shared/meson.build
+2 -2
View File
@@ -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
src/shared/os-util.c
+1 -1
View File
@@ -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"
src/sysext/sysext.c
+1 -1
View File
@@ -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"
src/test/test-tables.c
+1 -1
View File
@@ -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"