about summary refs log tree commit diff
path: root/nixos/modules/tasks/filesystems
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2022-08-10 15:20:52 +0200
committerGitHub <noreply@github.com>2022-08-10 15:20:52 +0200
commita7f89ddd6313ef88fc9c6534ac2511ba9da85fdb (patch)
tree2cf3c45076f624226e753e63ffbbe50fbdd51191 /nixos/modules/tasks/filesystems
parentf2f95b120bda675c3eba6d6bf01360c5b9a78e9c (diff)
parentab2e77ea829c20eeb4f451b751b5ddd85e1307c6 (diff)
downloadnixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.tar
nixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.tar.gz
nixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.tar.bz2
nixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.tar.lz
nixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.tar.xz
nixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.tar.zst
nixlib-a7f89ddd6313ef88fc9c6534ac2511ba9da85fdb.zip
Merge pull request #185763 from srhb/zfs-scrub-synchronously
nixos/zfs: scrub synchronously
Diffstat (limited to 'nixos/modules/tasks/filesystems')
-rw-r--r--nixos/modules/tasks/filesystems/zfs.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index dcd83094b093..1d661eae8275 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -767,10 +767,10 @@ in
         description = "ZFS pools scrubbing";
         after = [ "zfs-import.target" ];
         serviceConfig = {
-          Type = "oneshot";
+          Type = "simple";
         };
         script = ''
-          ${cfgZfs.package}/bin/zpool scrub ${
+          ${cfgZfs.package}/bin/zpool scrub -w ${
             if cfgScrub.pools != [] then
               (concatStringsSep " " cfgScrub.pools)
             else