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