mirror of
https://github.com/systemd/systemd
synced 2024-10-15 04:24:19 +00:00
Revert "dissect-image: don't probe swap partitions needlessly"
This reverts commit df4524cb37
.
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
This commit is contained in:
parent
a69a520bd4
commit
41aca66ba4
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue