From 00a8b34fa7220ecf7f5069f550bee53f9fc5ee47 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 9 Sep 2021 11:18:47 +0200 Subject: [PATCH] dissect-image: don't do generic root partition fallback if verity is requested for /usr --- src/shared/dissect-image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 566c073c29..3279c843ec 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -1348,7 +1348,7 @@ int dissect_image( if (!m->partitions[PARTITION_ROOT].found && !m->partitions[PARTITION_USR].found && (flags & DISSECT_IMAGE_GENERIC_ROOT) && - (!verity || !verity->root_hash)) { + (!verity || !verity->root_hash || verity->designator != PARTITION_USR)) { /* OK, we found nothing usable, then check if there's a single generic one distro, and use * that. If the root hash was set however, then we won't fall back to a generic node, because