rename module wide env variable to iso_env

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/proxinstall b/proxinstall
index 7ef8a84e4125bf8017b832c4067d7af2a8b937d6..ca9c091f0d238638b21a4a96bdf22a1cd528f0ef 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -42,11 +42,11 @@ if (!$ENV{G_SLICE} ||  $ENV{G_SLICE} ne "always-malloc") {
 
 $ENV{'LVM_SUPPRESS_FD_WARNINGS'} = '1';
 
-my $env = Proxmox::Install::ISOEnv::setup();
+my $iso_env = Proxmox::Install::ISOEnv::setup();
 
 my $zfstestpool = "test_rpool";
 my $zfspoolname = is_test_mode() ? $zfstestpool : 'rpool';
-my $zfsrootvolname = "$env->{product}-1";
+my $zfsrootvolname = "$iso_env->{product}-1";
 
 my $storage_cfg_zfs = <<__EOD__;
 dir: local
@@ -89,8 +89,8 @@ __EOD__
 
 Proxmox::Log::init("/tmp/install.log");
 
-my $proxmox_libdir = $env->{locations}->{lib};
-my $proxmox_cddir = $env->{locations}->{iso};
+my $proxmox_libdir = $iso_env->{locations}->{lib};
+my $proxmox_cddir = $iso_env->{locations}->{iso};
 my $proxmox_pkgdir = "${proxmox_cddir}/proxmox/packages/";
 
 my $boot_type = -d '/sys/firmware/efi' ? 'efi' : 'bios';
@@ -202,7 +202,7 @@ if ($cmdline =~ m/minfree=(\d+(\.\d+)?)[\s\n]/i) {
     $config_options->{minfree} = $1;
 }
 
-if ($env->{product} eq 'pve') {
+if ($iso_env->{product} eq 'pve') {
     if ($cmdline =~ m/maxvz=(\d+(\.\d+)?)[\s\n]/i) {
        $config_options->{maxvz} = $1;
     }
@@ -416,7 +416,7 @@ sub zfs_create_rpool {
     syscmd("zfs create $zfspoolname/ROOT")  == 0 ||
         die "unable to create zfs $zfspoolname/ROOT volume\n";
 
-    if ($env->{product} eq 'pve') {
+    if ($iso_env->{product} eq 'pve') {
        syscmd("zfs create $zfspoolname/data")  == 0 ||
            die "unable to create zfs $zfspoolname/data volume\n";
     }
@@ -506,7 +506,7 @@ sub ask_existing_vg_rename_or_abort {
 sub create_lvm_volumes {
     my ($lvmdev, $os_size, $swap_size) = @_;
 
-    my $vgname = $env->{product};
+    my $vgname = $iso_env->{product};
 
     ask_existing_vg_rename_or_abort($vgname);
 
@@ -530,7 +530,7 @@ sub create_lvm_volumes {
     my $rootsize;
     my $datasize = 0;
 
-    if ($env->{product} eq 'pve') {
+    if ($iso_env->{product} eq 'pve') {
 
        my $maxroot_mb;
        if ($config_options->{maxroot}) {
@@ -604,7 +604,7 @@ sub create_lvm_volumes {
        syscmd("/sbin/lvconvert --yes --type thin-pool --poolmetadatasize ${metadatasize}K $vgname/data") == 0 ||
            die "unable to create data thin-pool\n";
     } else {
-       if ($env->{product} eq 'pve' && !defined($config_options->{maxvz})) {
+       if ($iso_env->{product} eq 'pve' && !defined($config_options->{maxvz})) {
            Proxmox::UI::message("Skipping auto-creation of LVM thinpool for guest data due to low space.");
        }
        $datadev = undef;
@@ -935,7 +935,7 @@ sub extract_data {
        mkdir "$targetdir/var";
        mkdir "$targetdir/var/lib";
 
-       if ($env->{product} eq 'pve') {
+       if ($iso_env->{product} eq 'pve') {
            mkdir "$targetdir/var/lib/vz";
            mkdir "$targetdir/var/lib/pve";
 
@@ -955,7 +955,7 @@ sub extract_data {
        my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size) = stat ($basefile);
        $ino || die "unable to open file '$basefile' - $!\n";
 
-       my $files = file_read_firstline("${proxmox_cddir}/proxmox/$env->{product}-base.cnt") ||
+       my $files = file_read_firstline("${proxmox_cddir}/proxmox/$iso_env->{product}-base.cnt") ||
            die "unable to read base file count\n";
 
        my $per = 0;
@@ -1016,7 +1016,7 @@ sub extract_data {
 
        my $ethdev = $ipconf->{ifaces}->{$ipconf->{selected}}->{name};
 
-       if ($env->{cfg}->{bridged_network}) {
+       if ($iso_env->{cfg}->{bridged_network}) {
            $ifaces .= "iface $ethdev $ntype manual\n";
 
            $ifaces .=
@@ -1124,7 +1124,7 @@ sub extract_data {
        }
 
        # Note: keyboard-configuration/xbkb-keymap is used by console-setup
-       my $xkmap = $env->{locales}->{kmap}->{$keymap}->{x11} // 'us';
+       my $xkmap = $iso_env->{locales}->{kmap}->{$keymap}->{x11} // 'us';
 
        debconfig_set ($targetdir, <<_EOD);
 locales locales/default_environment_locale select en_US.UTF-8
@@ -1186,7 +1186,7 @@ _EOD
        file_write_all("$targetdir/etc/timezone", "$timezone\n");
 
        # set apt mirror
-       if (my $mirror = $env->{locales}->{country}->{$country}->{mirror}) {
+       if (my $mirror = $iso_env->{locales}->{country}->{$country}->{mirror}) {
            my $fn = "$targetdir/etc/apt/sources.list";
            syscmd("sed -i 's/ftp\\.debian\\.org/$mirror/' '$fn'");
        }
@@ -1198,7 +1198,7 @@ _EOD
        # allow ssh root login
        syscmd(['sed', '-i', 's/^#\?PermitRootLogin.*/PermitRootLogin yes/', "$targetdir/etc/ssh/sshd_config"]);
 
-       if ($env->{product} eq 'pmg') {
+       if ($iso_env->{product} eq 'pmg') {
            # install initial clamav DB
            my $srcdir = "${proxmox_cddir}/proxmox/clamav";
            foreach my $fn ("main.cvd", "bytecode.cvd", "daily.cvd", "safebrowsing.cvd") {
@@ -1209,7 +1209,7 @@ _EOD
                die "unable to set owner for clamav database files\n";
        }
 
-       if ($env->{product} eq 'pve') {
+       if ($iso_env->{product} eq 'pve') {
            # save installer settings
            my $ucc = uc ($country);
            debconfig_set($targetdir, "pve-manager pve-manager/country string $ucc\n");
@@ -1299,11 +1299,11 @@ _EOD
        run_command("chroot $targetdir /usr/sbin/chpasswd", undef,
                    "root:$octets\n");
 
-       if ($env->{product} eq 'pmg') {
+       if ($iso_env->{product} eq 'pmg') {
            # save admin email
            file_write_all("$targetdir/etc/pmg/pmg.conf", "section: admin\n\temail ${mailto}\n");
 
-       } elsif ($env->{product} eq 'pve') {
+       } elsif ($iso_env->{product} eq 'pve') {
 
            # create pmxcfs DB
 
@@ -1311,7 +1311,7 @@ _EOD
            mkdir $tmpdir;
 
            # write vnc keymap to datacenter.cfg
-           my $vnckmap = $env->{locales}->{kmap}->{$keymap}->{kvm} || 'en-us';
+           my $vnckmap = $iso_env->{locales}->{kmap}->{$keymap}->{kvm} || 'en-us';
            file_write_all("$tmpdir/datacenter.cfg", "keyboard: $vnckmap\n");
 
            # save admin email
@@ -1333,7 +1333,7 @@ _EOD
            run_command("chroot $targetdir /usr/bin/create_pmxcfs_db /tmp/pve /var/lib/pve-cluster/config.db");
 
            syscmd("rm -rf $tmpdir");
-       } elsif ($env->{product} eq 'pbs') {
+       } elsif ($iso_env->{product} eq 'pbs') {
            my $base_cfg_path = "/etc/proxmox-backup";
            mkdir "$targetdir/$base_cfg_path";
 
@@ -1457,7 +1457,7 @@ sub create_main_window {
 
     my $vbox = Gtk3::Box->new('vertical', 0);
 
-    my $logofn = "$env->{product}-banner.png";
+    my $logofn = "$iso_env->{product}-banner.png";
     my $image = Gtk3::Image->new_from_file("${proxmox_libdir}/$logofn");
 
     my $provider = Gtk3::CssProvider->new();
@@ -1527,7 +1527,7 @@ sub create_main_window {
     $gtk_state->{progress_bar} = Gtk3::ProgressBar->new();
     $gtk_state->{progress_status} = Gtk3::Label->new('');
 
-    Proxmox::UI::init_gtk($gtk_state, $env);
+    Proxmox::UI::init_gtk($gtk_state, $iso_env);
 
     $window->show_all;
     $window->present();
@@ -1696,7 +1696,7 @@ sub create_ipconf_view {
 
     $vbox->pack_start($devicebox, 0, 0, 2);
 
-    my $hn = $config->{fqdn} // "$env->{product}." . ($ipconf->{domain} // "example.invalid");
+    my $hn = $config->{fqdn} // "$iso_env->{product}." . ($ipconf->{domain} // "example.invalid");
 
     my ($hostbox, $hostentry) = create_text_input($hn, 'Hostname (FQDN):');
     $vbox->pack_start($hostbox, 0, 0, 2);
@@ -1819,13 +1819,13 @@ sub create_ack_view {
     $vbox->pack_start($reboot_checkbox, 0, 0, 2);
 
     my $ack_template = "${proxmox_libdir}/html/ack_template.htm";
-    my $ack_html = "${proxmox_libdir}/html/$env->{product}/$steps[$step_number]->{html}";
+    my $ack_html = "${proxmox_libdir}/html/$iso_env->{product}/$steps[$step_number]->{html}";
     my $html_data = file_read_all($ack_template);
 
     my %config_values = (
        __target_hd__ => join(' | ', @{$config_options->{target_hds}}),
        __target_fs__ => $config_options->{filesys},
-       __country__ => $env->{locales}->{country}->{$country}->{name},
+       __country__ => $iso_env->{locales}->{country}->{$country}->{name},
        __timezone__ => $timezone,
        __keymap__ => $keymap,
        __mailto__ => $mailto,
@@ -1890,7 +1890,7 @@ sub update_layout {
     my $ind;
     my $def;
     my $i = 0;
-    my $kmaphash = $env->{locales}->{kmaphash};
+    my $kmaphash = $iso_env->{locales}->{kmaphash};
     foreach my $layout (sort keys %$kmaphash) {
        $def = $i if $kmaphash->{$layout} eq 'en-us';
        $ind = $i if $kmap && $kmaphash->{$layout} eq $kmap;
@@ -1923,7 +1923,7 @@ sub update_zonelist {
        $timezone = $cb->get_active_text();
     });
 
-    my ($cczones, $zones) = $env->{locales}->@{'cczones', 'zones'};
+    my ($cczones, $zones) = $iso_env->{locales}->@{'cczones', 'zones'};
     my @available_zones = $cc && defined($cczones->{$cc}) ? keys %{$cczones->{$cc}} : keys %$zones;
 
     my ($i, $selected_index) = (0, undef);
@@ -2039,7 +2039,7 @@ sub create_country_view {
 
     cleanup_view();
 
-    my $locales = $env->{locales};
+    my $locales = $iso_env->{locales};
 
     my $vbox2 =  Gtk3::Box->new('vertical', 0);
     $gtk_state->{inbox}->pack_start($vbox2, 1, 0, 0);
@@ -2482,7 +2482,7 @@ sub create_hdoption_view {
        'zfs (RAIDZ-3)',
     ];
     push @$fstype, 'btrfs (RAID0)', 'btrfs (RAID1)', 'btrfs (RAID10)'
-       if $env->{cfg}->{enable_btrfs};
+       if $iso_env->{cfg}->{enable_btrfs};
 
     my $tcount = 0;
     foreach my $tmp (@$fstype) {
@@ -2529,7 +2529,7 @@ sub create_hdoption_view {
     push @$hdsize_labeled_widgets, "swapsize", $entry_swapsize;
 
     my $entry_maxroot = Gtk3::Entry->new();
-    if ($env->{product} eq 'pve') {
+    if ($iso_env->{product} eq 'pve') {
        $entry_maxroot->set_tooltip_text("maximum size (GB) for LVM root volume");
        $entry_maxroot->signal_connect (key_press_event => \&check_float);
        $entry_maxroot->set_text($config_options->{maxroot}) if $config_options->{maxroot};
@@ -2543,7 +2543,7 @@ sub create_hdoption_view {
     push @$hdsize_labeled_widgets, "minfree", $entry_minfree;
 
     my $entry_maxvz;
-    if ($env->{product} eq 'pve') {
+    if ($iso_env->{product} eq 'pve') {
        $entry_maxvz = Gtk3::Entry->new();
        $entry_maxvz->set_tooltip_text("maximum size (GB) for LVM data volume");
        $entry_maxvz->signal_connect (key_press_event => \&check_float);
@@ -2584,7 +2584,7 @@ sub create_hdoption_view {
        if ($raid) {
            my $msg = "<b>Note</b>: " . ($is_zfs
                ? "ZFS is not compatible with hardware RAID controllers, for details see the documentation."
-               : "BTRFS integration in $env->{cfg}->{fullname} is a technology preview!"
+               : "BTRFS integration in $iso_env->{cfg}->{fullname} is a technology preview!"
            );
            $hw_raid_note->set_markup($msg);
        }
@@ -2906,7 +2906,7 @@ sub create_extract_view {
 
     my $tdir = is_test_mode() ? "target" : "/target";
     mkdir $tdir;
-    my $base = "${proxmox_cddir}/$env->{product}-base.squashfs";
+    my $base = "${proxmox_cddir}/$iso_env->{product}-base.squashfs";
 
     eval  { extract_data($base, $tdir); };
     my $err = $@;
@@ -2916,11 +2916,11 @@ sub create_extract_view {
     set_next("_Reboot", sub { app_quit(0); } );
 
     my $success_transform = sub {
-       my ($raw_html, $env) = @_;
+       my ($raw_html, $iso_env) = @_;
 
        my $addr = $ipversion == 6 ? "[${ipaddress}]" : "$ipaddress";
        $raw_html =~ s/__IPADDR__/$addr/g;
-       $raw_html =~ s/__PORT__/$env->{cfg}->{port}/g;
+       $raw_html =~ s/__PORT__/$iso_env->{cfg}->{port}/g;
 
        my $autoreboot_msg = $config_options->{autoreboot}
            ? "Automatic reboot scheduled in $autoreboot_seconds seconds."
@@ -2960,10 +2960,10 @@ sub create_intro_view {
 
     if (int($total_memory) < 1024) {
        Proxmox::UI::error("Less than 1 GiB of usable memory detected, installation will probably fail.\n\n".
-           "See 'System Requirements' in the $env->{cfg}->{fullname} documentation.");
+           "See 'System Requirements' in the $iso_env->{cfg}->{fullname} documentation.");
     }
 
-    if ($env->{product} eq 'pve') {
+    if ($iso_env->{product} eq 'pve') {
        my $cpuinfo = eval { file_read_all('/proc/cpuinfo') };
        if (!$cpuinfo || $cpuinfo !~ /^flags\s*:.*(vmx|svm)/m) {
            Proxmox::UI::error(
@@ -2974,7 +2974,7 @@ sub create_intro_view {
     }
 
     Proxmox::UI::display_html('license.htm', sub {
-       my ($raw_html, $env) = @_;
+       my ($raw_html, $iso_env) = @_;
 
        my $license = eval { decode('utf8', file_read_all("${proxmox_cddir}/EULA")) };
        if (my $err = $@) {
@@ -2996,7 +2996,7 @@ $ipconf = Proxmox::Sys::Net::get_ip_config();
 
 $country = detect_country() if $ipconf->{default} || is_test_mode();
 
-if (!defined($env->{locales}->{country}->{$country})) {
+if (!defined($iso_env->{locales}->{country}->{$country})) {
     log_warn("ignoring detected country '$country', invalid or unknown\n");
     $country = undef;
 }