diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-10-18 17:55:28 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-10-18 18:41:11 +0300 |
| commit | 1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159 (patch) | |
| tree | 475685423c753de272f91296575febb5fd15dade | |
| parent | 3c7871a1c027da0b22c8b280944e374273f2874b (diff) | |
| download | nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.gz nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.bz2 nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.lz nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.xz nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.zst nixpkgs-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.zip | |
nixos/luksroot: use 'nuke-refs -e' option to simplify things
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 4a14ff1879c..0a680b2d5cf 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -432,6 +432,8 @@ in cat > $out/bin/openssl-wrap <<EOF #!$out/bin/sh + export OPENSSL_CONF=$out/etc/ssl/openssl.cnf + $out/bin/openssl "\$@" EOF chmod +x $out/bin/openssl-wrap ''} @@ -442,11 +444,6 @@ in ${optionalString luks.yubikeySupport '' $out/bin/ykchalresp -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 ''} ''; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 4399123f0c3..81102a83541 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -104,7 +104,7 @@ let stripDirs "lib bin" "-s" # 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 if ! test -L $i; then |