From 1599c37a6b717e9dc2cd421a31e4968aa7b3744f Mon Sep 17 00:00:00 2001 From: Hugo Lageneste Date: Fri, 4 Apr 2025 23:39:05 +0200 Subject: [PATCH] nixos/luksroot: remove useless $new_k_luks Remove the variable new_k_luks used only once in the code. --- nixos/modules/system/boot/luksroot.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 59c5cdb71b00..af7362231ea5 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -408,13 +408,12 @@ let return fi - if [ ! -z "$k_user" ]; then - new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)" + if [ -n "$k_user" ]; then + echo -n $k_user else - new_k_luks="$(echo | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)" - fi + echo + fi | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response > /crypt-ramfs/new_key - echo -n "$new_k_luks" | hextorb > /crypt-ramfs/new_key echo -n "$k_luks" | hextorb | ${cschange} --key-file=- /crypt-ramfs/new_key if [ $? == 0 ]; then