Skip to content

Commit 55e8dc3

Browse files
nixos/luksroot: remove useless $new_k_luks (#115832)
2 parents d124cf4 + 1599c37 commit 55e8dc3

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

nixos/modules/system/boot/luksroot.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,12 @@ let
408408
return
409409
fi
410410
411-
if [ ! -z "$k_user" ]; then
412-
new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)"
411+
if [ -n "$k_user" ]; then
412+
echo -n $k_user
413413
else
414-
new_k_luks="$(echo | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)"
415-
fi
414+
echo
415+
fi | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response > /crypt-ramfs/new_key
416416
417-
echo -n "$new_k_luks" | hextorb > /crypt-ramfs/new_key
418417
echo -n "$k_luks" | hextorb | ${cschange} --key-file=- /crypt-ramfs/new_key
419418
420419
if [ $? == 0 ]; then

0 commit comments

Comments
 (0)