]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "dissect: ID from os-release should be non-empty, not just non-NULL"
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Jul 2022 05:38:23 +0000 (14:38 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Jul 2022 05:39:54 +0000 (14:39 +0900)
This reverts commit a2cf73f0b602a93a32107cfc066a5e307263c577.

This is not necessary after 78ab2b5064a0f87579ce5430f9cb83bba0db069a.

Addresses https://github.com/systemd/systemd/pull/23454#discussion_r913611798.

src/shared/dissect-image.c

index 68f7912674b9c8d10691a378e2a482862d40e9d3..07ec7b777615715d0b75ff55184992f52a29e25e 100644 (file)
@@ -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);