about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-06-13 22:37:05 +0100
committerGitHub <noreply@github.com>2018-06-13 22:37:05 +0100
commitcc7aa24c8c39d2817ad6aa302ecbf8fc421b9431 (patch)
tree6808d8b22051e022330760febe9e508fdd92fb5d /nixos
parente2bc05edc6d931dfe29324b6c7a0b93ab4608dd7 (diff)
parentbea4323acf44bad55bf3083926ea0c188aebd74d (diff)
downloadnixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.tar
nixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.tar.gz
nixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.tar.bz2
nixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.tar.lz
nixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.tar.xz
nixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.tar.zst
nixlib-cc7aa24c8c39d2817ad6aa302ecbf8fc421b9431.zip
Merge pull request #41928 from woffs/zfs-service-enable
nixos/zfs: enable zfs services
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/tasks/filesystems/zfs.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index de735e9ba11b..c54cfd4e1aa6 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -414,12 +414,15 @@ in
               ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}"
             '';
           };
+        createZfsService = serv:
+          nameValuePair serv {
+            after = [ "systemd-modules-load.service" ];
+            wantedBy = [ "zfs.target" ];
+          };
 
-      in listToAttrs (map createImportService dataPools ++ map createSyncService allPools) // {
-        "zfs-mount" = { after = [ "systemd-modules-load.service" ]; };
-        "zfs-share" = { after = [ "systemd-modules-load.service" ]; };
-        "zfs-zed" = { after = [ "systemd-modules-load.service" ]; };
-      };
+      in listToAttrs (map createImportService dataPools ++
+                      map createSyncService allPools ++
+                      map createZfsService [ "zfs-mount" "zfs-share" "zfs-zed" ]);
 
       systemd.targets."zfs-import" =
         let