← Back to team overview

curtin-dev team mailing list archive

Re: [Merge] ~dbungert/curtin:cryptoswap-dmc-type into curtin:master

 

> Can you expand the commit message a whole bunch please?

Done, or let me know if you would prefer more.

Diff comments:

> diff --git a/curtin/commands/block_meta.py b/curtin/commands/block_meta.py
> index 9fde9c6..e2e99e3 100644
> --- a/curtin/commands/block_meta.py
> +++ b/curtin/commands/block_meta.py
> @@ -1710,6 +1712,7 @@ def dm_crypt_handler(info, storage_config, context):
>  
>              util.subp(cmd)
>  
> +    if open_dmcrypt:
>          cmd = ["cryptsetup", "open", "--type", luks_type, volume_path, dm_name,
>                 "--key-file", keyfile]

Nope!  This function is long so I can understand the question.  I have improved the name that triggers keyfile removal, and added tests that show that it is removed only when it should be.

>  


-- 
https://code.launchpad.net/~dbungert/curtin/+git/curtin/+merge/460874
Your team curtin developers is subscribed to branch curtin:master.



References