movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-14 21:49:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/clevis: fix clevis in scripted initrd

Browse source 
Fixes #389750
This commit is contained in:
Julien Malka 2025-05-25 01:34:06 +02:00
parent 4ed3050fe2
commit 9655143028
No known key found for this signature in database
GPG key ID: 6FC74C847011FD83
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/system/boot/clevis.nix
View file

@ -81,7 +81,7 @@ in
extraUtilsCommands = lib.mkIf (!systemd.enable) '' extraUtilsCommands = lib.mkIf (!systemd.enable) ''
copy_bin_and_libs ${pkgs.jose}/bin/jose copy_bin_and_libs ${pkgs.jose}/bin/jose
copy_bin_and_libs ${pkgs.curl}/bin/curl copy_bin_and_libs ${pkgs.curl}/bin/curl
copy_bin_and_libs ${pkgs.bash}/bin/bash copy_bin_and_libs ${pkgs.bashNonInteractive}/bin/bash
copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped copy_bin_and_libs ${pkgs.tpm2-tools}/bin/.tpm2-wrapped
mv $out/bin/{.tpm2-wrapped,tpm2} mv $out/bin/{.tpm2-wrapped,tpm2}
@ -95,7 +95,7 @@ in
done done
for BIN in $out/bin/clevis{,-decrypt{,-null,-tang,-tpm2}}; do for BIN in $out/bin/clevis{,-decrypt{,-null,-tang,-tpm2}}; do
sed -i $BIN -e 's,${pkgs.bash},,' -e 's,${pkgs.coreutils},,' sed -i $BIN -e 's,${pkgs.bashNonInteractive},,' -e 's,${pkgs.coreutils},,'
done done
sed -i $out/bin/clevis-decrypt-tpm2 -e 's,tpm2_,tpm2 ,' sed -i $out/bin/clevis-decrypt-tpm2 -e 's,tpm2_,tpm2 ,'