From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 26 Oct 2025 12:42:26 +0000 (+0900)
Subject: repart: merge common conditions
X-Git-Tag: v259-rc1~186^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ae29ead7e398bb282da47ac522caceaa611c2b;p=thirdparty%2Fsystemd.git

repart: merge common conditions

No functional change, just refactoring.
---

diff --git a/src/repart/repart.c b/src/repart/repart.c
index 5ae14b32181..fbfa52c223a 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -5580,13 +5580,15 @@ static int partition_format_verity_sig(Context *context, Partition *p) {
 
         verity_settings = lookup_verity_settings_by_uuid_pair(rp->current_uuid, hp->current_uuid);
 
-        if (!context->private_key && !verity_settings)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Verity signature partition signing requested but no private key provided (--private-key=).");
+        if (!verity_settings) {
+                if (!context->private_key)
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                               "Verity signature partition signing requested but no private key provided (--private-key=).");
 
-        if (!context->certificate && !verity_settings)
-                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Verity signature partition signing requested but no PEM certificate provided (--certificate=).");
+                if (!context->certificate)
+                        return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
+                                               "Verity signature partition signing requested but no PEM certificate provided (--certificate=).");
+        }
 
         (void) partition_hint(p, context->node, &hint);