diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-02-03 11:45:31 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-02-03 11:45:31 +0100 |
| commit | 5b9bfe5625f68a72f215341ef4601793eb58cb8b (patch) | |
| tree | 5ace0b946a7aa15f33784ecc47cb38933ae358c3 /nixos/modules/tasks/filesystems/zfs.nix | |
| parent | 0e784a2a3b027dd87ecf432fca9b0fdc9bed5d08 (diff) | |
| download | nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.tar nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.tar.gz nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.tar.bz2 nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.tar.lz nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.tar.xz nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.tar.zst nixpkgs-5b9bfe5625f68a72f215341ef4601793eb58cb8b.zip | |
zfs: fix invalid package references
Diffstat (limited to 'nixos/modules/tasks/filesystems/zfs.nix')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d69a161b896..b750820bfa5 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -528,7 +528,7 @@ in ${optionalString (if isBool cfgZfs.requestEncryptionCredentials then cfgZfs.requestEncryptionCredentials else cfgZfs.requestEncryptionCredentials != []) '' - ${packages.zfsUser}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do + ${cfgZfs.package}/sbin/zfs list -rHo name,keylocation ${pool} | while IFS=$'\t' read ds kl; do (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) '' if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then continue @@ -538,10 +538,10 @@ in none ) ;; prompt ) - ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${packages.zfsUser}/sbin/zfs load-key "$ds" + ${config.systemd.package}/bin/systemd-ask-password "Enter key for $ds:" | ${cfgZfs.package}/sbin/zfs load-key "$ds" ;; * ) - ${packages.zfsUser}/sbin/zfs load-key "$ds" + ${cfgZfs.package}/sbin/zfs load-key "$ds" ;; esac) < /dev/null # To protect while read ds kl in case anything reads stdin done |