From 30dfe035eb8a6539f5997a798402d2d5225f8567 Mon Sep 17 00:00:00 2001 From: maanyagoenka Date: Wed, 29 Mar 2023 20:34:21 +0000 Subject: extension-release: establish compatibility between host file and extension-release file The release file that accompanies the confext images needs to be host compatible to be able to be merged into the host /etc/ directory. This commit checks for version compatibility between the image file and the host file. --- src/sysext/sysext.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/sysext') diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c index e7d8e801fc..97cf8ba52e 100644 --- a/src/sysext/sysext.c +++ b/src/sysext/sysext.c @@ -574,7 +574,8 @@ static int merge_subprocess(Hashmap *images, const char *workspace) { host_os_release_version_id, host_os_release_sysext_level, in_initrd() ? "initrd" : "system", - img->extension_release); + img->extension_release, + IMAGE_SYSEXT); if (r < 0) return r; if (r == 0) { @@ -996,7 +997,7 @@ static int run(int argc, char *argv[]) { /* For debugging purposes it might make sense to do this for other hierarchies than /usr/ and * /opt/, but let's make that a hacker/debugging feature, i.e. env var instead of cmdline * switch. */ - r = parse_env_extension_hierarchies(&arg_hierarchies); + r = parse_env_extension_hierarchies(&arg_hierarchies, "SYSTEMD_SYSEXT_HIERARCHIES"); if (r < 0) return log_error_errno(r, "Failed to parse $SYSTEMD_SYSEXT_HIERARCHIES environment variable: %m"); -- cgit v1.2.1