Hi Rebecca

On Thu, 16 Oct 2014 22:22:29 +0100 "Rebecca N. Palmer"
<rebecca_pal...@zoho.com> wrote:
> Control: tags -1 patch
> 
> Looks like the "swap=plain" assumption is at 
> src/cryptsetup/cryptsetup.c:162; here's a patch (untested as yet, will 
> try it in the morning if I don't hear anything).
> 
> --- cryptsetup.c      2014-10-16 22:10:00.369584521 +0100
> +++ cryptsetup2.c     2014-10-16 22:13:32.765582134 +0100
> @@ -159,7 +159,7 @@ static int parse_one_option(const char *
>           } else if (streq(option, "tcrypt-system")) {
>                   arg_type = CRYPT_TCRYPT;
>                   arg_tcrypt_system = true;
> -        } else if (STR_IN_SET(option, "plain", "swap", "tmp"))
> +        } else if (streq(option, "plain") || (arg_type == NULL && 
> STR_IN_SET(option, "swap", "tmp")))
>                   arg_type = CRYPT_PLAIN;
>           else if (startswith(option, "timeout=")) {

Please test, if your problem still exists with a recent version of
systemd (ideally test v241 from unstable/buster or the v241 backport for
stretch).

If you still run into problems and your patch still applies, please
consider forwarding it to upstream as pull request via
https://github.com/systemd/systemd/

We usually only apply patches to Debian which have been reviewed and
accepted upstream.

Regards,
Michael
-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to