summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorJack Cummings <jack@mudshark.org>2013-08-12 15:53:57 -0700
committerEvgeny Egorochkin <phreedom@yandex.ru>2013-09-02 13:53:28 +0300
commitf2523c08e4c118b0a56a48e6ce05b61839850478 (patch)
treee376fcdd82b31555c57e4e6b3864efd74cd017fe /modules
parente0dcfac2e2bf0ffb07f445654ff8bb1387ed96e9 (diff)
downloadnixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.tar
nixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.tar.gz
nixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.tar.bz2
nixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.tar.lz
nixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.tar.xz
nixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.tar.zst
nixlib-f2523c08e4c118b0a56a48e6ce05b61839850478.zip
fixiup zfs binaries in initrd
Previously, the zfs binaries were put in $out/sbin where the stage-1
patchelf wouldn't fix them up. This would fail the allowedReferences
test.

Move the zfs binaries to $out/bin.
Diffstat (limited to 'modules')
-rw-r--r--modules/tasks/filesystems/zfs.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/tasks/filesystems/zfs.nix b/modules/tasks/filesystems/zfs.nix
index 590eb002022b..c1955b146918 100644
--- a/modules/tasks/filesystems/zfs.nix
+++ b/modules/tasks/filesystems/zfs.nix
@@ -52,9 +52,9 @@ in
       kernelModules = [ "spl" "zfs" ] ;
       extraUtilsCommands =
         ''
-          cp -v ${kernel.zfs}/sbin/zfs $out/sbin
-          cp -v ${kernel.zfs}/sbin/zdb $out/sbin
-          cp -v ${kernel.zfs}/sbin/zpool $out/sbin
+          cp -v ${kernel.zfs}/sbin/zfs $out/bin
+          cp -v ${kernel.zfs}/sbin/zdb $out/bin
+          cp -v ${kernel.zfs}/sbin/zpool $out/bin
         '';
       postDeviceCommands =
         ''