movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/luksroot: use 'nuke-refs -e' option to simplify things

Browse source
This commit is contained in:
Nikolay Amiantov 2015-10-18 17:55:28 +03:00
parent 3c7871a1c0
commit 1bd3d9de2a
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/system/boot/luksroot.nix
View file

@ -432,6 +432,8 @@ in
cat > $out/bin/openssl-wrap <<EOF cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh #!$out/bin/sh
export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
$out/bin/openssl "\$@"
EOF EOF
chmod +x $out/bin/openssl-wrap chmod +x $out/bin/openssl-wrap
''} ''}
@ -442,11 +444,6 @@ in
${optionalString luks.yubikeySupport '' ${optionalString luks.yubikeySupport ''
$out/bin/ykchalresp -V $out/bin/ykchalresp -V
$out/bin/ykinfo -V $out/bin/ykinfo -V
cat > $out/bin/openssl-wrap <<EOF
#!$out/bin/sh
export OPENSSL_CONF=$out/etc/ssl/openssl.cnf
$out/bin/openssl "\$@"
EOF
$out/bin/openssl-wrap version $out/bin/openssl-wrap version
''} ''}
''; '';

2
nixos/modules/system/boot/stage-1.nix
View file

@ -104,7 +104,7 @@ let
stripDirs "lib bin" "-s" stripDirs "lib bin" "-s"
# Run patchelf to make the programs refer to the copied libraries. # Run patchelf to make the programs refer to the copied libraries.
for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs $i; fi; done for i in $out/bin/* $out/lib/*; do if ! test -L $i; then nuke-refs -e $out $i; fi; done
for i in $out/bin/*; do for i in $out/bin/*; do
if ! test -L $i; then if ! test -L $i; then