diff options
| author | maanyagoenka <maanyagoenka@microsoft.com> | 2023-02-24 00:37:52 +0000 |
|---|---|---|
| committer | maanyagoenka <maanyagoenka@microsoft.com> | 2023-04-05 21:50:04 +0000 |
| commit | b60e0f577740af89516f7c74967d7182637f27af (patch) | |
| tree | a384a6b2ab9435acc7feb1958948995b9238b2e3 /src/portable | |
| parent | 7393530f223a48528a045b10575668ed5b0e6a44 (diff) | |
| download | systemd-b60e0f577740af89516f7c74967d7182637f27af.tar.gz | |
os-util: add a new confext image type and the ability to parse their release files
Adds a new image type called IMAGE_CONFEXT which is similar to IMAGE_SYSEXT but works
for the /etc/ directory instead of /usr/ and /opt/. This commit also adds the ability to
parse the release file that is present with the confext image in /etc/confext-release.d/
directory.
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/portable.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/portable/portable.c b/src/portable/portable.c index adfd846bab..1878157e65 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -198,7 +198,7 @@ static int extract_now( /* First, find os-release/extension-release and send it upstream (or just save it). */ if (path_is_extension) { os_release_id = strjoina("/usr/lib/extension-release.d/extension-release.", image_name); - r = open_extension_release(where, image_name, relax_extension_release_check, &os_release_path, &os_release_fd); + r = open_extension_release(where, IMAGE_SYSEXT, image_name, relax_extension_release_check, &os_release_path, &os_release_fd); } else { os_release_id = "/etc/os-release"; r = open_os_release(where, &os_release_path, &os_release_fd); @@ -948,17 +948,17 @@ static int append_release_log_fields( static const char *const field_versions[_IMAGE_CLASS_MAX][4]= { [IMAGE_PORTABLE] = { "IMAGE_VERSION", "VERSION_ID", "BUILD_ID", NULL }, - [IMAGE_EXTENSION] = { "SYSEXT_IMAGE_VERSION", "SYSEXT_VERSION_ID", "SYSEXT_BUILD_ID", NULL }, + [IMAGE_SYSEXT] = { "SYSEXT_IMAGE_VERSION", "SYSEXT_VERSION_ID", "SYSEXT_BUILD_ID", NULL }, }; static const char *const field_ids[_IMAGE_CLASS_MAX][3]= { [IMAGE_PORTABLE] = { "IMAGE_ID", "ID", NULL }, - [IMAGE_EXTENSION] = { "SYSEXT_IMAGE_ID", "SYSEXT_ID", NULL }, + [IMAGE_SYSEXT] = { "SYSEXT_IMAGE_ID", "SYSEXT_ID", NULL }, }; _cleanup_strv_free_ char **fields = NULL; const char *id = NULL, *version = NULL; int r; - assert(IN_SET(type, IMAGE_PORTABLE, IMAGE_EXTENSION)); + assert(IN_SET(type, IMAGE_PORTABLE, IMAGE_SYSEXT)); assert(!strv_isempty((char *const *)field_ids[type])); assert(!strv_isempty((char *const *)field_versions[type])); assert(field_name); @@ -1106,7 +1106,7 @@ static int install_chroot_dropin( * still be able to identify what applies to what. */ r = append_release_log_fields(&text, ordered_hashmap_get(extension_releases, ext->name), - IMAGE_EXTENSION, + IMAGE_SYSEXT, "PORTABLE_EXTENSION_NAME_AND_VERSION"); if (r < 0) return r; |