summaryrefslogtreecommitdiff
path: root/src/portable/portabled-image-bus.c
diff options
context:
space:
mode:
authorLuca Boccassi <bluca@debian.org>2022-10-11 18:58:33 +0100
committerLuca Boccassi <bluca@debian.org>2022-10-12 09:57:24 +0100
commit06768b90a32ac0d36252ebc5f426ad471bf29fce (patch)
tree69c46b241bd6724e1bdddcd9c5176ffa45e1598a /src/portable/portabled-image-bus.c
parentaad813bf170c7d901fcf1b664303e0204642ac61 (diff)
downloadsystemd-06768b90a32ac0d36252ebc5f426ad471bf29fce.tar.gz
portable: allow caller to override extension-release name check
When the --force flag is used, do not insist that the extension-release file has to match the extension image name
Diffstat (limited to 'src/portable/portabled-image-bus.c')
-rw-r--r--src/portable/portabled-image-bus.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 7d393476a0..b108fd34af 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -108,6 +108,7 @@ int bus_image_common_get_metadata(
_cleanup_hashmap_free_ Hashmap *unit_files = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_free_ PortableMetadata **sorted = NULL;
+ PortableFlags flags = 0;
int r;
assert(name_or_path || image);
@@ -142,6 +143,7 @@ int bus_image_common_get_metadata(
return sd_bus_reply_method_errorf(message, SD_BUS_ERROR_INVALID_ARGS,
"Invalid 'flags' parameter '%" PRIu64 "'",
input_flags);
+ flags |= input_flags;
}
r = bus_image_acquire(m,
@@ -161,6 +163,7 @@ int bus_image_common_get_metadata(
image->path,
matches,
extension_images,
+ flags,
&os_release,
&extension_releases,
&unit_files,