summary refs log tree commit diff
path: root/nixos/modules/system/boot/luksroot.nix
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2015-10-18 17:55:28 +0300
committerNikolay Amiantov <ab@fmap.me>2015-10-18 18:41:11 +0300
commit1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159 (patch)
tree475685423c753de272f91296575febb5fd15dade /nixos/modules/system/boot/luksroot.nix
parent3c7871a1c027da0b22c8b280944e374273f2874b (diff)
downloadnixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar
nixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.gz
nixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.bz2
nixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.lz
nixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.xz
nixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.tar.zst
nixlib-1bd3d9de2acf17e4b727cbf4d1487d5ad5e42159.zip
nixos/luksroot: use 'nuke-refs -e' option to simplify things
Diffstat (limited to 'nixos/modules/system/boot/luksroot.nix')
-rw-r--r--nixos/modules/system/boot/luksroot.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 4a14ff1879c9..0a680b2d5cf2 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
       ''}
     '';