aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosselin Poiret <dev@jpoiret.xyz>2021-11-15 20:53:41 +0000
committerLudovic Courtès <ludo@gnu.org>2021-12-01 17:51:37 +0100
commita82e9f45fd9f7c67123b7064c60065281035c744 (patch)
tree1289118ecd6b5ae7f3951ffa5695b5cc39d18863
parent4c5f970e8a2b946d9ae9f45631781ae3e1dc34dd (diff)
downloadguix-a82e9f45fd9f7c67123b7064c60065281035c744.tar.gz
guix-a82e9f45fd9f7c67123b7064c60065281035c744.zip
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>
-rw-r--r--gnu/installer/parted.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index ad7dd6bf91..616b99c3cb 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)