JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zfs: fix invalid package references

Browse Source
This commit is contained in:
Jörg Thalheim 2021-02-03 11:45:31 +01:00
parent 0e784a2a3b
commit 5b9bfe5625
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/tasks/filesystems/zfs.nix
View File

@ -528,7 +528,7 @@ in
${optionalString (if isBool cfgZfs.requestEncryptionCredentials ${optionalString (if isBool cfgZfs.requestEncryptionCredentials
then cfgZfs.requestEncryptionCredentials then cfgZfs.requestEncryptionCredentials
else 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) '' (${optionalString (!isBool cfgZfs.requestEncryptionCredentials) ''
if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then if ! echo '${concatStringsSep "\n" cfgZfs.requestEncryptionCredentials}' | grep -qFx "$ds"; then
continue continue
@ -538,10 +538,10 @@ in
none ) none )
;; ;;
prompt ) 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 esac) < /dev/null # To protect while read ds kl in case anything reads stdin
done done