proxmox-mirrors/pve-installer
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-installer synced 2025-04-28 18:36:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move setting global environment variables into ISO env

Browse Source 
could be also done in RunEnv, as one could argue both, this is
set at runtime, and this is for the ISO installer environment.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2023-06-19 21:16:03 +02:00
parent 71583761ea
commit ddd96e5cb9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Proxmox/Install/ISOEnv.pm
View File

@ -122,6 +122,11 @@ my sub get_locations {
}; };
} }
# setup global environment already on module load
$ENV{DEBIAN_FRONTEND} = 'noninteractive';
$ENV{LC_ALL} = 'C';
$ENV{'LVM_SUPPRESS_FD_WARNINGS'} = '1';
sub setup { sub setup {
my $cd_info = get_cd_info(); my $cd_info = get_cd_info();
my $product = $cd_info->{product}; my $product = $cd_info->{product};

5
proxinstall
View File

@ -3,9 +3,6 @@
use strict; use strict;
use warnings; use warnings;
$ENV{DEBIAN_FRONTEND} = 'noninteractive';
$ENV{LC_ALL} = 'C';
use Getopt::Long; use Getopt::Long;
use IPC::Open2; use IPC::Open2;
use IO::File; use IO::File;
@ -43,8 +40,6 @@ if (!$ENV{G_SLICE} || $ENV{G_SLICE} ne "always-malloc") {
Proxmox::Install::ISOEnv::set_test_image($test_image) if $test_image; Proxmox::Install::ISOEnv::set_test_image($test_image) if $test_image;
} }
$ENV{'LVM_SUPPRESS_FD_WARNINGS'} = '1';
my $iso_env = Proxmox::Install::ISOEnv::setup(); my $iso_env = Proxmox::Install::ISOEnv::setup();
my $run_env = Proxmox::Install::RunEnv::query_installation_environment(); my $run_env = Proxmox::Install::RunEnv::query_installation_environment();