about summary refs log tree commit diff
path: root/nixos/modules/tasks
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2013-10-27 04:17:23 -0500
committerEvgeny Egorochkin <phreedom@yandex.ru>2013-10-30 16:17:44 +0200
commitc2f35087d22d1064cc260152777b6802ab272618 (patch)
tree498fe4a01d2e0f09042f30db9731a702942c9e34 /nixos/modules/tasks
parentddc809d6dac2d00eafaf9d5f7ce4d4863b40b2f5 (diff)
downloadnixlib-c2f35087d22d1064cc260152777b6802ab272618.tar
nixlib-c2f35087d22d1064cc260152777b6802ab272618.tar.gz
nixlib-c2f35087d22d1064cc260152777b6802ab272618.tar.bz2
nixlib-c2f35087d22d1064cc260152777b6802ab272618.tar.lz
nixlib-c2f35087d22d1064cc260152777b6802ab272618.tar.xz
nixlib-c2f35087d22d1064cc260152777b6802ab272618.tar.zst
nixlib-c2f35087d22d1064cc260152777b6802ab272618.zip
Add ZFS dependencies to the initrd so that the zpool command works.
Remove unneeded zfs mount, since zpool automatically mounts everything.

Close #1128.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r--nixos/modules/tasks/filesystems/zfs.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c1955b146918..efd546f3baa0 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -55,11 +55,12 @@ in
           cp -v ${kernel.zfs}/sbin/zfs $out/bin
           cp -v ${kernel.zfs}/sbin/zdb $out/bin
           cp -v ${kernel.zfs}/sbin/zpool $out/bin
+          cp -pdv ${kernel.zfs}/lib/lib*.so* $out/lib
+          cp -pdv ${pkgs.zlib}/lib/lib*.so* $out/lib
         '';
       postDeviceCommands =
         ''
           zpool import -f -a -d /dev
-          zfs mount -a
         '';
     };