From 02e243166168ca65c225eef2f86091c7eb4c3c55 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 16 Jan 2014 21:37:44 +0100
Subject: zfs: Don't look for devices only in /dev

If we don't give out a directory to 'zpool import', it will use libblkid
to automatically find all existing ZFS devices.
---
 nixos/modules/tasks/filesystems/zfs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nixos/modules/tasks')

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7c3c662eeac9..853cd833fd04 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -60,7 +60,7 @@ in
         '';
       postDeviceCommands =
         ''
-          zpool import -f -a -d /dev
+          zpool import -f -a
         '';
     };
 
@@ -71,7 +71,7 @@ in
         Type = "oneshot";
         RemainAfterExit = true;
         restartIfChanged = false;
-        ExecStart = "${kernel.zfs}/sbin/zpool import -f -a -d /dev";
+        ExecStart = "${kernel.zfs}/sbin/zpool import -f -a";
       };
     };
 
-- 
cgit 1.4.1