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

busybox: Add a default udhcpc dispatcher script #92581

Merged
merged 4 commits into from Jul 31, 2020
Merged

busybox: Add a default udhcpc dispatcher script #92581

merged 4 commits into from Jul 31, 2020

Conversation

TethysSvensson
Copy link
Contributor

@TethysSvensson TethysSvensson commented Jul 7, 2020 •
edited

Motivation for this change

The udhcpc binary which currently ships as part of the busybox
derivation will by default search for a dispatcher script at the
location /usr/share/udhcpc/default.script.

It would be much nicer if udhcpc had a functional default script.

Things done

This commit includes a working default script with udhcpc and updates
the location where udhcpc searches for this script.

The script was taken the script from the udhcpc package in debian
buster. The only changes from that script is to make it use paths from
the nix store and remove the run-time check for /sbin/resolvconf.

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

@TethysSvensson
busybox: Add a default udhcpc dispatcher script
b98ad8d 
The udhcpc binary which currently ships as part of the busybox
derivation will by default search for a dispatcher script at the
location /usr/share/udhcpc/default.script.

This commit includes a working default script with udhcpc and updates
the location where udhcpc searches for this script.

The script was taken the script from the udhcpc package in debian
buster. The only changes from that script is to make it use paths from
the nix store and remove the run-time check for /sbin/resolvconf.
@TethysSvensson
Copy link
Contributor Author

/marvin opt-in

@marvin-mk2 marvin-mk2 bot added the marvin label Jul 20, 2020
@marvin-mk2
Copy link

marvin-mk2 bot commented Jul 20, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@TethysSvensson
Copy link
Contributor Author

/status needs_reviewer

@TethysSvensson
Copy link
Contributor Author

TethysSvensson commented Jul 26, 2020 •
edited

I noticed that this package does not have a maintainer.

I would be okay with being added as a maintainer, though I am not yet a nix maintainer. Just to be sure, is that anything else to do than adding myself to maintainer-list.nix and to the maintainer field in the busybox/default.nix?

@TethysSvensson
Copy link
Contributor Author

@matthewbauer Would you be able to review this PR or help me find someone who can?

@TethysSvensson
Copy link
Contributor Author

@grahamc I do not understand what this CI error means.

What does access to URI 'http://deb.debian.org/debian/pool/main/b/busybox/busybox_1.30.1-5.debian.tar.xz' is forbidden in restricted mode mean?

@TethysSvensson
Copy link
Contributor Author

Result of nixpkgs-review pr 92581 1

2 packages blacklisted:
- tests.nixos-functions.nixos-test
- tests.nixos-functions.nixosTest-test
7 packages failed to build:
- deepin.dde-kwin
- deepin.dde-launcher
- deepin.dde-session-ui
- deepin.startdde
- hydra-unstable
- nix-exec
- python37Packages.nixpkgs
60 packages built:
- bundix
- busybox
- busybox-sandbox-shell
- cabal2nix
- cachix
- common-updater-scripts
- crystal2nix
- dep2nix
- disnix
- disnixos
- epson-escpr2
- fcron
- fusionInventory
- go2nix
- haskellPackages.cachix
- haskellPackages.hercules-ci-agent
- haskellPackages.nix-paths
- hercules-ci-agent
- hydra-migration
- lightdm
- lightdm-enso-os-greeter
- lightdm-mini-greeter
- lightdm-tiny-greeter
- lightdm_gtk_greeter
- lightdm_qt
- lispPackages.quicklisp-to-nix
- lispPackages.quicklisp-to-nix-system-info
- molly-guard
- nix (nixStable)
- nix-build-uncached
- nix-bundle
- nix-direnv
- nix-du
- nix-index
- nix-pin
- nix-plugins
- nix-prefetch
- nix-prefetch-bzr
- nix-prefetch-cvs
- nix-prefetch-docker
- nix-prefetch-git
- nix-prefetch-hg
- nix-prefetch-scripts
- nix-prefetch-svn
- nix-serve
- nix-update
- nix-update-source
- nixFlakes (nixUnstable)
- nixos-generators
- nixos-shell
- nixpkgs-review
- nixui
- pantheon.elementary-greeter
- pantheon.nixpkgs-github-update
- pipework
- python37Packages.pythonix
- python38Packages.nixpkgs
- python38Packages.pythonix
- vgo2nix
- vulnix

As far as I can tell, those 7 packages are also broken on master.

@Mic92 Mic92 merged commit b75f211 into NixOS:master Jul 31, 2020
@TethysSvensson TethysSvensson deleted the busybox-udhcpc-script branch August 7, 2020 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer left review comments

@grahamc grahamc grahamc left review comments

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 11-100 11.by: package-maintainer 12. first-time contribution awaiting_reviewer marvin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@TethysSvensson @matthewbauer @grahamc @Mic92 @Janik-Haag