Commit 03a74b74 authored by Ondrej Kozina's avatar Ondrej Kozina Committed by Milan Broz

Revert "Fix data alignment calculations with custom encryption sector size."

This reverts commit 71dd149c.

Enforcing data alignment to be encryption sector size aligned
is completelly wrong. The underlying data device alignment
has nothing to do with dm-crypt internal encryption sector size.

The restriction is however valid for dm-crypt segment size.
parent 248f99ca
......@@ -936,7 +936,7 @@ static int action_luksFormat(void)
.data_device = opt_header_device ? action_argv[0] : NULL,
};
struct crypt_params_luks2 params2 = {
.data_alignment = params1.data_alignment / (opt_sector_size >> 9),
.data_alignment = params1.data_alignment,
.data_device = params1.data_device,
.sector_size = opt_sector_size,
.label = opt_label,
......@@ -2651,12 +2651,6 @@ int main(int argc, const char **argv)
_("Unsupported encryption sector size.\n"),
poptGetInvocationName(popt_context));
if (opt_align_payload % (opt_sector_size / SECTOR_SIZE)) {
usage(popt_context, EXIT_FAILURE,
_("Payload alignment (in 512-byte sectors) is not a multiple of requested sector size.\n"),
poptGetInvocationName(popt_context));
}
if (opt_unbound && !opt_key_size)
usage(popt_context, EXIT_FAILURE,
_("Key size is required with --unbound option.\n"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment