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

singularity-tools: Check for /bin/sh existence before symlink #93082

Merged
merged 1 commit into from Sep 19, 2020
Merged

singularity-tools: Check for /bin/sh existence before symlink #93082

merged 1 commit into from Sep 19, 2020

Conversation

cfhammill
Copy link
Contributor

Fixes the case where the user has bashInteractive in the container contents

Motivation for this change

Unable to build a singularity container that included bashInteractive for readline in my singularity container.

Things done

Just checks for the existence of /bin/sh before symlinking the runtime shell, this fixes the case where that is in the /bin of one of the contents.

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

@cfhammill
singularity-tools: Check for /bin/sh existence before symlink
8975b7b 
Fixes the case where the user has bashInteractive in the
container contents
@cfhammill cfhammill mentioned this pull request Jul 14, 2020
Open
@cfhammill
Copy link
Contributor Author

@jbedo is this check a sane thing to do? Or will using bashInteractive to supply /bin/sh cause problems I'm not anticipating?

@jbedo
Copy link
Contributor

jbedo commented Jul 27, 2020

Yes this is fine, should not cause any issues.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/230

@AndersonTorres AndersonTorres merged commit 6740a59 into NixOS:master Sep 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jbedo jbedo jbedo approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@cfhammill @jbedo @nixos-discourse @AndersonTorres