summaryrefslogtreecommitdiffstats
path: root/src/basic/os-util.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-16 18:18:34 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-16 18:18:34 +0000
commit67497cedb2f732b3445ecdc0d09b881f9c69f852 (patch)
treeb7197679acca419c7ddc0300873e19141d5fae3e /src/basic/os-util.c
parentAdding debian version 256.1-2. (diff)
downloadsystemd-67497cedb2f732b3445ecdc0d09b881f9c69f852.tar.xz
systemd-67497cedb2f732b3445ecdc0d09b881f9c69f852.zip
Merging upstream version 256.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/basic/os-util.c')
-rw-r--r--src/basic/os-util.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 0d26d18..79f641b 100644
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -259,13 +259,7 @@ int open_extension_release_at(
}
if (!relax_extension_release_check) {
- _cleanup_free_ char *base_image_name = NULL, *base_extension = NULL;
-
- r = path_extract_image_name(image_name, &base_image_name);
- if (r < 0) {
- log_debug_errno(r, "Failed to extract image name from %s/%s, ignoring: %m", dir_path, de->d_name);
- continue;
- }
+ _cleanup_free_ char *base_extension = NULL;
r = path_extract_image_name(extension, &base_extension);
if (r < 0) {
@@ -273,7 +267,7 @@ int open_extension_release_at(
continue;
}
- if (!streq(base_image_name, base_extension) &&
+ if (!streq(image_name, base_extension) &&
extension_release_strict_xattr_value(fd, dir_path, image_name) != 0)
continue;
}