diff options
| author | Shea Levy <shea@shealevy.com> | 2014-03-14 19:40:34 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-03-14 19:40:34 -0400 |
| commit | 602cf8d78c2ed90ceabc5866c4c1697fd72a6782 (patch) | |
| tree | 93689e4b8234ee8104f2e50c20da40807dbc69f5 /nixos/modules/tasks | |
| parent | 0c12dd3ded6088febb43cd69dea531eff220d5b1 (diff) | |
| parent | a7e65a8a957ceb752dd44d0447acee6c20309fe5 (diff) | |
| download | nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.tar nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.tar.gz nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.tar.bz2 nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.tar.lz nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.tar.xz nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.tar.zst nixlib-602cf8d78c2ed90ceabc5866c4c1697fd72a6782.zip | |
Merge branch 'u/zfs-import' of git://github.com/wizeman/nixpkgs
zfs: Misc fixes
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 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"; }; }; |