From 870d6da909f762cb64d25d0100d5b18157cd074f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 Jun 2025 12:20:13 +0200 Subject: [PATCH] gpt: add partition_designator_is_verity() helper And rework partition_designator_is_verity_sig() to be based on partition_verity_sig_to_data(), so that we don't have to maintain two lists of verity sig partition types. --- src/shared/gpt.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/shared/gpt.h b/src/shared/gpt.h index 9e5ace35a45..3261d0001b2 100644 --- a/src/shared/gpt.h +++ b/src/shared/gpt.h @@ -31,15 +31,19 @@ typedef enum PartitionDesignator { bool partition_designator_is_versioned(PartitionDesignator d) _const_; -static inline bool partition_designator_is_verity_sig(PartitionDesignator d) { - return IN_SET(d, PARTITION_ROOT_VERITY_SIG, PARTITION_USR_VERITY_SIG); -} - PartitionDesignator partition_verity_of(PartitionDesignator p) _const_; PartitionDesignator partition_verity_sig_of(PartitionDesignator p) _const_; PartitionDesignator partition_verity_to_data(PartitionDesignator d) _const_; PartitionDesignator partition_verity_sig_to_data(PartitionDesignator d) _const_; +static inline bool partition_designator_is_verity(PartitionDesignator d) { + return partition_verity_to_data(d) >= 0; +} + +static inline bool partition_designator_is_verity_sig(PartitionDesignator d) { + return partition_verity_sig_to_data(d) >= 0; +} + const char* partition_designator_to_string(PartitionDesignator d) _const_; PartitionDesignator partition_designator_from_string(const char *name) _pure_; -- 2.47.3