Skip to content
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

zerotierone: replace more ip commands #45383

Closed
wants to merge 1 commit into from
Closed

zerotierone: replace more ip commands #45383

wants to merge 1 commit into from

Conversation

zimbatm
Copy link
Member

@zimbatm zimbatm commented Aug 20, 2018

There is another place where ip is hard-coded to /usr/sbin/ip

Motivation for this change

Fix #45022

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@zimbatm
zerotierone: replace more ip commands
4129a0d 
There is another place where `ip` is hard-coded to /usr/sbin/ip
@commandodev
Copy link
Contributor

There is another one as well: https://github.com/zerotier/ZeroTierOne/blob/master/osdep/ManagedRoute.cpp#L65

#define ZT_LINUX_IP_COMMAND "/sbin/ip"
#define ZT_LINUX_IP_COMMAND_2 "/usr/sbin/ip"

Worth replacing both?

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: zerotierone

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: zerotierone

Partial log (click to expand)

strip is /nix/store/553rihc190vsyy8b22iqcq25a6489h8y-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/518h08y1lzgn5kzxcn6axgn4h48h0rx7-zerotierone-1.2.12/bin
patching script interpreter paths in /nix/store/518h08y1lzgn5kzxcn6axgn4h48h0rx7-zerotierone-1.2.12
checking for references to /build in /nix/store/518h08y1lzgn5kzxcn6axgn4h48h0rx7-zerotierone-1.2.12...
shrinking RPATHs of ELF executables and libraries in /nix/store/vhyv41dnvia4rwfvxa4pwplwrm6kw0rp-zerotierone-1.2.12-man
gzipping man pages under /nix/store/vhyv41dnvia4rwfvxa4pwplwrm6kw0rp-zerotierone-1.2.12-man/share/man/
strip is /nix/store/553rihc190vsyy8b22iqcq25a6489h8y-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/vhyv41dnvia4rwfvxa4pwplwrm6kw0rp-zerotierone-1.2.12-man
checking for references to /build in /nix/store/vhyv41dnvia4rwfvxa4pwplwrm6kw0rp-zerotierone-1.2.12-man...
/nix/store/518h08y1lzgn5kzxcn6axgn4h48h0rx7-zerotierone-1.2.12

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: zerotierone

Partial log (click to expand)

strip is /nix/store/4md2i310zklkkl5j41yw70gcwgn4kav5-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/gg5idrz3f11sijc17ajjhyqcgkwg36iq-zerotierone-1.2.12/bin
patching script interpreter paths in /nix/store/gg5idrz3f11sijc17ajjhyqcgkwg36iq-zerotierone-1.2.12
checking for references to /build in /nix/store/gg5idrz3f11sijc17ajjhyqcgkwg36iq-zerotierone-1.2.12...
shrinking RPATHs of ELF executables and libraries in /nix/store/ql276s66g8mbpf6qzmhn0v7dwp126cm0-zerotierone-1.2.12-man
gzipping man pages under /nix/store/ql276s66g8mbpf6qzmhn0v7dwp126cm0-zerotierone-1.2.12-man/share/man/
strip is /nix/store/4md2i310zklkkl5j41yw70gcwgn4kav5-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/ql276s66g8mbpf6qzmhn0v7dwp126cm0-zerotierone-1.2.12-man
checking for references to /build in /nix/store/ql276s66g8mbpf6qzmhn0v7dwp126cm0-zerotierone-1.2.12-man...
/nix/store/gg5idrz3f11sijc17ajjhyqcgkwg36iq-zerotierone-1.2.12

@commandodev
Copy link
Contributor

There's a stray comma in the edit @zimbatm can I push to this branch?

@commandodev commandodev mentioned this pull request Aug 20, 2018
Merged
@zimbatm zimbatm closed this Aug 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zimbatm @commandodev @GrahamcOfBorg