branch master updated: Revert "installer: Make LUKS2 the default format for encrypted devices"

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new e5e307b  Revert "installer: Make LUKS2 the default format for 
encrypted devices"
e5e307b is described below

commit e5e307b6768088e35be0c7526f25a3e16d93c242
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Wed Dec 8 23:22:09 2021 +0100

    Revert "installer: Make LUKS2 the default format for encrypted devices"
    
    This reverts commit a82e9f45fd9f7c67123b7064c60065281035c744 at the
    author's request.  We are not quite ready to boot all resulting
    systems.
    
    See <https://logs.guix.gnu.org/guix/2021-12-08.log#231815>.
---
 gnu/installer/parted.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 616b99c..ad7dd6b 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1169,9 +1169,8 @@ 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" "--type" "luks2"
-                "--pbkdf" "pbkdf2" file-name key-file)
-       (system* "cryptsetup" "open"
+       (system* "cryptsetup" "-q" "luksFormat" file-name key-file)
+       (system* "cryptsetup" "open" "--type" "luks"
                 "--key-file" key-file file-name label)))))
 
 (define (luks-close user-partition)