dissect: fix root hash signature autodiscovery

The root hash signature is auto discovered only if the root hash was specified
manually. Ensure that an auto discovered root hash is also enough.

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index bfde5cd5a0122b9fbc6a57e440b64fc6f30cfcae..f2634139f76d97dd4850534a1e0ca3ce529ade36 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -2123,7 +2123,7 @@ int verity_settings_load(
                 }
         }
 
-        if (verity->root_hash && !verity->root_hash_sig) {
+        if ((root_hash || verity->root_hash) && !verity->root_hash_sig) {
                 if (root_hash_sig_path) {
                         r = read_full_file(root_hash_sig_path, (char**) &root_hash_sig, &root_hash_sig_size);
                         if (r < 0 && r != -ENOENT)