bump version to 8.2.6

[pve-installer.git] / Proxmox / Install / RunEnv.pm

diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm
index c393f679cb8d5c8bb23da81644451f32e48079f7..7eaf96a08af9475d54acdb4632d4a26c27dcc792 100644 (file)
--- a/Proxmox/Install/RunEnv.pm
+++ b/Proxmox/Install/RunEnv.pm
@@ -7,7 +7,8 @@ use Carp;
 use JSON qw(from_json to_json);
 
 use Proxmox::Log;
-use Proxmox::Sys::File qw(file_read_firstline);
+use Proxmox::Sys::Command qw(run_command CMD_FINISHED);
+use Proxmox::Sys::File qw(file_read_all file_read_firstline);
 use Proxmox::Sys::Block;
 use Proxmox::Sys::Net;
 
@@ -188,35 +189,37 @@ my sub detect_country_tracing_to : prototype($$) {
     my ($ipver, $destination) = @_;
 
     print STDERR "trying to detect country...\n";
-    open(my $TRACEROUTE_FH, '-|', 'traceroute', "-$ipver", '-N', '1', '-q', '1', '-n', $destination)
-       or return undef;
 
+    my $traceroute_cmd = ['traceroute', "-$ipver", '-N', '1', '-q', '1', '-n', $destination];
     my $geoip_bin = ($ipver == 6) ? 'geoiplookup6' : 'geoiplookup';
 
     my $country;
-
-    my $previous_alarm = alarm (10);
+    my $previous_alarm;
     eval {
        local $SIG{ALRM} = sub { die "timed out!\n" };
-       my $line;
-       while (defined ($line = <$TRACEROUTE_FH>)) {
+       $previous_alarm = alarm (10);
+
+       run_command($traceroute_cmd, sub {
+           my $line = shift;
+
            log_debug("DC TRACEROUTE: $line");
            if ($line =~ m/^\s*\d+\s+(\S+)\s/) {
                my $geoip = qx/$geoip_bin $1/;
                log_debug("DC GEOIP: $geoip");
+
                if ($geoip =~ m/GeoIP Country Edition:\s*([A-Z]+),/) {
                    $country = lc ($1);
                    log_info("DC FOUND: $country\n");
-                   last;
+                   return CMD_FINISHED;
                }
+               return;
            }
-       }
+       }, undef, undef, 1);
+
     };
     my $err = $@;
     alarm ($previous_alarm);
 
-    close($TRACEROUTE_FH);
-
     if ($err) {
        die "unable to detect country - $err\n";
     } elsif ($country) {
@@ -282,6 +285,16 @@ sub query_installation_environment : prototype() {
     $output->{hvm_supported} = query_cpu_hvm_support();
     $output->{boot_type} = -d '/sys/firmware/efi' ? 'efi' : 'bios';
 
+    if ($output->{boot_type} eq 'efi') {
+       my $content = eval { file_read_all("/sys/firmware/efi/efivars/SecureBoot-8be4df61-93ca-11d2-aa0d-00e098032b8c") };
+       if ($@) {
+           log_warn("Failed to read secure boot state: $@\n");
+       } else {
+           my @secureboot = unpack("CCCCC", $content);
+           $output->{secure_boot} = $secureboot[4] == 1;
+       }
+    }
+
     my $err;
     my $country;
     if ($routes->{gateway4}) {
@@ -299,7 +312,7 @@ sub query_installation_environment : prototype() {
     if (defined($country)) {
        $output->{country} = $country;
     } else {
-       warn ($err // "unable to detect country\n");
+       warn ($err || "unable to detect country\n");
     }
 
     return $output;