04/11: installer: Make LUKS2 the default format for encrypted devices

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit a82e9f45fd9f7c67123b7064c60065281035c744
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Mon Nov 15 20:53:41 2021 +0000

    installer: Make LUKS2 the default format for encrypted devices
    
    * gnu/installer/parted.scm (luks-format-and-open): Change it.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/installer/parted.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index ad7dd6b..616b99c 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1169,8 +1169,9 @@ USER-PARTITION if it is encrypted, or the plain file-name 
otherwise."
      (lambda (key-file)
        (syslog "formatting and opening LUKS entry ~s at ~s~%"
                label file-name)
-       (system* "cryptsetup" "-q" "luksFormat" file-name key-file)
-       (system* "cryptsetup" "open" "--type" "luks"
+       (system* "cryptsetup" "-q" "luksFormat" "--type" "luks2"
+                "--pbkdf" "pbkdf2" file-name key-file)
+       (system* "cryptsetup" "open"
                 "--key-file" key-file file-name label)))))
 
 (define (luks-close user-partition)