From ddd96e5cb9f9a1cc7d1f537ae1988efad0ee80bf Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 19 Jun 2023 21:16:03 +0200 Subject: [PATCH] move setting global environment variables into ISO env 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 --- Proxmox/Install/ISOEnv.pm | 5 +++++ proxinstall | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Proxmox/Install/ISOEnv.pm b/Proxmox/Install/ISOEnv.pm index d43e1f9..faca026 100644 --- a/Proxmox/Install/ISOEnv.pm +++ b/Proxmox/Install/ISOEnv.pm @@ -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 { my $cd_info = get_cd_info(); my $product = $cd_info->{product}; diff --git a/proxinstall b/proxinstall index d19f314..04845e8 100755 --- a/proxinstall +++ b/proxinstall @@ -3,9 +3,6 @@ use strict; use warnings; -$ENV{DEBIAN_FRONTEND} = 'noninteractive'; -$ENV{LC_ALL} = 'C'; - use Getopt::Long; use IPC::Open2; 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; } -$ENV{'LVM_SUPPRESS_FD_WARNINGS'} = '1'; - my $iso_env = Proxmox::Install::ISOEnv::setup(); my $run_env = Proxmox::Install::RunEnv::query_installation_environment();