fhs-userenv: refactor envvars and propagate SSL_CERT_FILE

+10 -6
+10 -6
pkgs/build-support/build-fhs-userenv/chroot-user.rb
··· 17 17 mkdirs = ['tmp', 18 18 ] 19 19 20 + # Propagate environment variables 21 + envvars = [ 'TERM', 22 + 'DISPLAY', 23 + 'HOME', 24 + 'XDG_RUNTIME_DIR', 25 + 'LANG', 26 + 'SSL_CERT_FILE', 27 + ] 28 + 20 29 require 'tmpdir' 21 30 require 'fileutils' 22 31 require 'pathname' ··· 120 129 link_swdir.call swdir, Pathname.new('') 121 130 122 131 # New environment 123 - ENV.replace({ 'TERM' => ENV['TERM'], 124 - 'DISPLAY' => ENV['DISPLAY'], 125 - 'HOME' => ENV['HOME'], 126 - 'XDG_RUNTIME_DIR' => ENV['XDG_RUNTIME_DIR'], 127 - 'LANG' => ENV['LANG'], 128 - }) 132 + ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ]) 129 133 130 134 # Finally, exec! 131 135 exec *execp