Merge pull request #34149 from DaanDeMeyer/btrfs

repart: Switch to new mkfs.btrfs subvolume API
This commit is contained in:
Daan De Meyer
2024-09-03 08:47:50 +02:00
committed by GitHub
3 changed files with 263 additions and 28 deletions
+2 -2
View File
@@ -376,7 +376,7 @@ int image_policy_from_string(const char *s, ImagePolicy **ret) {
int partition_policy_flags_to_string(PartitionPolicyFlags flags, bool simplify, char **ret) {
_cleanup_free_ char *buf = NULL;
const char *l[CONST_LOG2U(_PARTITION_POLICY_MASK) + 1]; /* one string per known flag at most */
const char *l[CONST_LOG2U(_PARTITION_POLICY_MASK + 1) + 1]; /* one string per known flag at most */
size_t m = 0;
assert(ret);
@@ -437,7 +437,7 @@ int partition_policy_flags_to_string(PartitionPolicyFlags flags, bool simplify,
if (m == 0)
buf = strdup("-");
else {
assert(m+1 < ELEMENTSOF(l));
assert(m < ELEMENTSOF(l));
l[m] = NULL;
buf = strv_join((char**) l, "+");