morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23918 from yuwata/dissect

Browse Source 
Revert "dissect: ID from os-release should be non-empty, not just non-NULL"
This commit is contained in:
Luca Boccassi
2022-07-06 21:31:04 +01:00
committed by GitHub
parent da519f8c81 d30d86b7ed
commit c235945bd5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/dissect-image.c
View File

@@ -3217,9 +3217,11 @@ int verity_dissect_and_mount(
* First, check the distro ID. If that matches, then check the new SYSEXT_LEVEL value if
* available, or else fallback to VERSION_ID. If neither is present (eg: rolling release),
* then a simple match on the ID will be performed. */
if (!isempty(required_host_os_release_id)) {
if (required_host_os_release_id) {
_cleanup_strv_free_ char **extension_release = NULL;
assert(!isempty(required_host_os_release_id));
r = load_extension_release_pairs(dest, dissected_image->image_name, &extension_release);
if (r < 0)
return log_debug_errno(r, "Failed to parse image %s extension-release metadata: %m", dissected_image->image_name);