From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 27 Feb 2023 12:45:17 +0000 (+0100)
Subject: Revert "dissect-image: don't probe swap partitions needlessly"
X-Git-Tag: v254-rc1~1151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41aca66ba4f3a72ad709ef27e334392ef177450c;p=thirdparty%2Fsystemd.git

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
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index ce37dd31ceb..b20e21cce2d 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)) {