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.

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

buildFHSUserEnvBubblewrap: fix whitespace with root directories #101967

Merged
merged 1 commit into from Oct 31, 2020
Merged

buildFHSUserEnvBubblewrap: fix whitespace with root directories #101967

merged 1 commit into from Oct 31, 2020

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Oct 28, 2020 •
edited

Motivation for this change

closes #101942

I tried doing the same to the ro_mounts, but for some reason the entire array was getting escaped in a ' .. ', which was causing issues.

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.

worldofpeace
worldofpeace suggested changes Oct 28, 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.

This commit doesn't change anything in bubblewrap but the userenv builder used by steam?
Should change the attribute

@jonringer
Copy link
Contributor Author

jonringer commented Oct 28, 2020 •
edited

This commit doesn't change anything in bubblewrap but the userenv builder used by steam?
Should change the attribute

This fixes the issue when root directories contain whitespace. If you look at the related issue, the directory '/with space', would be passed as --bind /with space /with space to the bwrap command, but it is now correctly passed as --bind '/with space' '/with space'

steam is just one consumer, there's many other packages as well

@jonringer jonringer changed the title bubblewrap: fix whitespace with root directories buildFHSUserEnvBubblewrap: fix whitespace with root directories Oct 28, 2020
@jonringer
Copy link
Contributor Author

if you were referring to the commit message pointing to the application, I changed it to the more correct buildFHSUserEnvBubblewrap

@worldofpeace
Copy link
Contributor

if you were referring to the commit message pointing to the application, I changed it to the more correct buildFHSUserEnvBubblewrap

Yep, that's what I meant.

@jonringer
Copy link
Contributor Author

anyway, able to run steam from this

@jonringer jonringer merged commit ec38df8 into NixOS:master Oct 31, 2020
@jonringer jonringer deleted the fix-bubble-whitespace branch October 31, 2020 05:53
Atemu added a commit to Atemu/nixpkgs that referenced this pull request Nov 22, 2020
@Atemu
buildFHSUserEnvBubblewrap: use arrays for constructing argument list
74c4a55 
Generally a cleaner way of doing it and prevents issues with spaces in paths

Used to fix NixOS#97234 but NixOS#101967 already didt this with a smaller scope
@Atemu Atemu mentioned this pull request Nov 22, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@bennofs bennofs Awaiting requested review from bennofs

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

Successfully merging this pull request may close these issues.

launching buildFHSUserEnvBubblewrap fails when / contains directory with spaces
2 participants
@jonringer @worldofpeace