Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8ac04f784214
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0599f5be721e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 10, 2020

  1. 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.

(cherry picked from commit b3d4f5d)
    @grahamc
    grahamc committed Nov 10, 2020
    Copy the full SHA
    2260adb View commit details

  2. Merge pull request #103313 from grahamc/zfs-script-bp 

    [20.09] zfs: extend zpool scripts with :$PATH, remove sudo
    @grahamc
    grahamc authored Nov 10, 2020
    Copy the full SHA
    0599f5b View commit details
Showing with 4 additions and 3 deletions.
  1. +4 −3 pkgs/os-specific/linux/zfs/default.nix
7 changes: 4 additions & 3 deletions pkgs/os-specific/linux/zfs/default.nix
View file
Original file line number Diff line number Diff line change
@@ -165,10 +165,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
'';