diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-06 07:38:23 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-07-06 07:39:54 +0200 |
| commit | 8b2dcbbd000c5fb9390d4eef6c65490a42e951bd (patch) | |
| tree | 8260a7b8c3ff1d8a1cf4efefe2b3877dfba4fbf7 /src/shared/dissect-image.c | |
| parent | Merge pull request #23916 from keszybz/assorted-patches (diff) | |
| download | systemd-8b2dcbbd000c5fb9390d4eef6c65490a42e951bd.tar.xz systemd-8b2dcbbd000c5fb9390d4eef6c65490a42e951bd.zip | |
Revert "dissect: ID from os-release should be non-empty, not just non-NULL"
This reverts commit a2cf73f0b602a93a32107cfc066a5e307263c577.
This is not necessary after 78ab2b5064a0f87579ce5430f9cb83bba0db069a.
Addresses https://github.com/systemd/systemd/pull/23454#discussion_r913611798.
Diffstat (limited to '')
| -rw-r--r-- | src/shared/dissect-image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 68f7912674..07ec7b7776 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -3217,7 +3217,7 @@ 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; r = load_extension_release_pairs(dest, dissected_image->image_name, &extension_release); |