diff options
| author | Lassulus <github@lassul.us> | 2022-07-03 18:07:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-03 18:07:53 +0200 |
| commit | 92c4b16caf82116294d2cb99350906f4b93621fb (patch) | |
| tree | 9f3988a1aa1f9ecff7c1e20d181537136a258a78 /nixos/modules/tasks | |
| parent | 50982a1265ecddf1ba95983b9e6b10b968c96b36 (diff) | |
| parent | d1754b1ab08027265ff7dec1148eebcc6e128080 (diff) | |
| download | nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.tar nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.tar.gz nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.tar.bz2 nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.tar.lz nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.tar.xz nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.tar.zst nixpkgs-92c4b16caf82116294d2cb99350906f4b93621fb.zip | |
Merge pull request #171401 from klemensn/filesystems-zfs
Small ZFS handling improvements
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index c8bbfe9769b..05174e03754 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -549,7 +549,7 @@ in zfs load-key -a '' else concatMapStrings (fs: '' - zfs load-key ${fs} + zfs load-key -- ${escapeShellArg fs} '') cfgZfs.requestEncryptionCredentials} '') rootPools)); @@ -701,7 +701,7 @@ in # expand every pool. Otherwise we want to enumerate # just the specifically provided list of pools. poolListProvider = if cfgExpandOnBoot == "all" - then "$(zpool list -H | awk '{print $1}')" + then "$(zpool list -H -o name)" else lib.escapeShellArgs cfgExpandOnBoot; in { |