diff options
| author | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-01-27 13:59:45 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@microsoft.com> | 2021-02-17 22:45:31 +0100 |
| commit | bcf94222a5e3492eadff5d1d9ba711402c192f58 (patch) | |
| tree | f1ea7c759181d60f00e80063b64b1f3676977d90 /src/shared/discover-image.c | |
| parent | dissect: parse, store and show extension-release info (diff) | |
| download | systemd-bcf94222a5e3492eadff5d1d9ba711402c192f58.tar.xz systemd-bcf94222a5e3492eadff5d1d9ba711402c192f58.zip | |
machine: parse and store extension-release
Follow the same pattern as os-release parsing, and store the key-value
pairs in a strv if found
Diffstat (limited to 'src/shared/discover-image.c')
| -rw-r--r-- | src/shared/discover-image.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/shared/discover-image.c b/src/shared/discover-image.c index 1f5e4c6f86..fbce201e29 100644 --- a/src/shared/discover-image.c +++ b/src/shared/discover-image.c @@ -71,6 +71,7 @@ static Image *image_free(Image *i) { free(i->hostname); strv_free(i->machine_info); strv_free(i->os_release); + strv_free(i->extension_release); return mfree(i); } @@ -1129,7 +1130,7 @@ int image_read_metadata(Image *i) { case IMAGE_SUBVOLUME: case IMAGE_DIRECTORY: { - _cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL; + _cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL, **extension_release = NULL; sd_id128_t machine_id = SD_ID128_NULL; _cleanup_free_ char *hostname = NULL; _cleanup_free_ char *path = NULL; @@ -1176,10 +1177,15 @@ int image_read_metadata(Image *i) { if (r < 0) log_debug_errno(r, "Failed to read os-release in image, ignoring: %m"); + r = load_extension_release_pairs(i->path, i->name, &extension_release); + if (r < 0) + log_debug_errno(r, "Failed to read extension-release in image, ignoring: %m"); + free_and_replace(i->hostname, hostname); i->machine_id = machine_id; strv_free_and_replace(i->machine_info, machine_info); strv_free_and_replace(i->os_release, os_release); + strv_free_and_replace(i->extension_release, extension_release); break; } @@ -1205,6 +1211,7 @@ int image_read_metadata(Image *i) { i->machine_id = m->machine_id; strv_free_and_replace(i->machine_info, m->machine_info); strv_free_and_replace(i->os_release, m->os_release); + strv_free_and_replace(i->extension_release, m->extension_release); break; } |