From 791754f6837f5fa1e9c73cf3362d6109b5b5912e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 27 Feb 2023 13:45:17 +0100 Subject: [PATCH] Revert "dissect-image: don't probe swap partitions needlessly" This reverts commit df4524cb3796529b435af309f5e6a2d92bcdaaa0. This commit is just wrong. The thing is that we *don't* know automatically that the partition contains a swap image, because it could be encrypted. Hence revert. Fixes: #26595 (cherry picked from commit 41aca66ba4f3a72ad709ef27e334392ef177450c) --- src/shared/dissect-image.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 210e2c7cf7..4749bdd230 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -984,7 +984,10 @@ static int dissect_image( if (pflags & SD_GPT_FLAG_NO_AUTO) continue; - fstype = "swap"; + /* Note: we don't set fstype = "swap" here, because we still need to probe if + * it might be encrypted (i.e. fstype "crypt_LUKS") or unencrypted + * (i.e. fstype "swap"), and the only way to figure that out is via fstype + * probing. */ /* We don't have a designator for SD_GPT_LINUX_GENERIC so check the UUID instead. */ } else if (sd_id128_equal(type.uuid, SD_GPT_LINUX_GENERIC)) {