summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2020-11-10 08:48:18 -0500
committerGraham Christensen <graham@grahamc.com>2020-11-10 08:50:22 -0500
commitb3d4f5dada2264dc55e55717ce33589536908c00 (patch)
tree1c4c313ceebf37c0e27e1a9d77fabb4f1106fa22 /pkgs/os-specific/linux/zfs
parent24c8927c4a80db656c535893b65eb75e8cf0fcf0 (diff)
downloadnixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.tar
nixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.tar.gz
nixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.tar.bz2
nixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.tar.lz
nixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.tar.xz
nixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.tar.zst
nixpkgs-b3d4f5dada2264dc55e55717ce33589536908c00.zip
zfs: extend zpool scripts with :$PATH, remove sudo
sudo the package is not suid, so remove it from the PATH. Extend
PATH with $PATH to fetch sudo from the outer PATH. Move the generation
of `path` in to Nix, so the sed expression can use single quotes,
which prevents $PATH being interpolated at build-time.
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index bb4a2dcf979..b9a8c83060b 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -161,10 +161,11 @@ let
         (cd $out/share/bash-completion/completions; ln -s zfs zpool)
       '';
 
-      postFixup = ''
-        path="PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat sudo ]}"
+      postFixup = let
+        path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep utillinux smartmontools sysstat ]}:$PATH";
+      in ''
         for i in $out/libexec/zfs/zpool.d/*; do
-          sed -i "2i$path" $i
+          sed -i '2i${path}' $i
         done
       '';