aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2021-12-08 23:22:09 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2021-12-08 23:23:19 +0100
commite5e307b6768088e35be0c7526f25a3e16d93c242 (patch)
treef6aeb9b93afc4b59ac55227f641d9b990000ac75
parentf3af1fb0bcbcbe18ab773374efe606e90107cfb6 (diff)
downloadguix-e5e307b6768088e35be0c7526f25a3e16d93c242.tar
guix-e5e307b6768088e35be0c7526f25a3e16d93c242.tar.gz
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>.
-rw-r--r--gnu/installer/parted.scm5
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 616b99c3cb..ad7dd6bf91 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)