public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11602 from zimbatm/stricter-chroot-user 

build-fhs-userenv: don't leak file descriptors
This commit is contained in:
Nikolay Amiantov 2015-12-11 00:40:41 +03:00
parent b398371e80 9b33ec1764
commit 8ec4b45dbd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/build-fhs-userenv/chroot-user.rb
View File

@ -140,10 +140,10 @@ if $cpid == 0
link_swdir.call swdir, Pathname.new('') link_swdir.call swdir, Pathname.new('')
# New environment # New environment
ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ]) new_env = Hash[ envvars.map { |x| [x, ENV[x]] } ]
# Finally, exec! # Finally, exec!
exec *execp exec(new_env, *execp, close_others: true, unsetenv_others: true)
end end
# Wait for a child. If we catch a signal, resend it to child and continue # Wait for a child. If we catch a signal, resend it to child and continue