From cc477fb34d8924c88d29e77b5101070c907a7aac Mon Sep 17 00:00:00 2001 From: Paul Haerle Date: Sat, 6 Aug 2022 21:51:31 +0200 Subject: [PATCH 1/2] zfs: Make zpool available for zpool-expand-pools ...if cfgExpandOnBoot == "all", otherwise it fails during runtime: ``` Aug 06 19:38:05 nixos zpool-expand-pools-start[981]: /nix/store/ka3vivdray82mi9dql12yf258gkw643l-unit-script-zpool-expand-pools-start/bin/zpool-expand-pools-start: line 3: zpool: command not found ``` --- nixos/modules/tasks/filesystems/zfs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 795879c6764c..0fc5bb555aa3 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -713,6 +713,8 @@ in Type = "oneshot"; RemainAfterExit = true; }; + + path = lib.optionals (cfgExpandOnBoot == "all") [ cfgZfs.package ]; script = '' for pool in ${poolListProvider}; do From 944a46637360c0235fb9e338bdc8349fefac1ab0 Mon Sep 17 00:00:00 2001 From: Paul Haerle Date: Sat, 6 Aug 2022 21:57:14 +0200 Subject: [PATCH 2/2] fix whitespace --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 0fc5bb555aa3..dcd83094b093 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -713,7 +713,7 @@ in Type = "oneshot"; RemainAfterExit = true; }; - + path = lib.optionals (cfgExpandOnBoot == "all") [ cfgZfs.package ]; script = ''