Skip to content

[20.09] zfs: extend zpool scripts with :$PATH, remove sudo #103313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 10, 2020
Merged

[20.09] zfs: extend zpool scripts with :$PATH, remove sudo #103313

merged 1 commit into from
Nov 10, 2020
+4 −3

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Nov 10, 2020

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)

Backport of #103307

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@grahamc
zfs: extend zpool scripts with :$PATH, remove sudo
2260adb 
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)
worldofpeace
worldofpeace approved these changes Nov 10, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Harmless bugfix

@grahamc grahamc merged commit 0599f5b into NixOS:release-20.09 Nov 10, 2020
@grahamc grahamc deleted the zfs-script-bp branch November 10, 2020 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@grahamc @worldofpeace