$gtk_state->{progress_bar} = Gtk3::ProgressBar->new();
$gtk_state->{progress_status} = Gtk3::Label->new('');
$gtk_state->{abort_btn} = $abort;
+ $gtk_state->{disk_selection} = {};
Proxmox::UI::init_gtk($gtk_state, $iso_env);
my ($cidr_box, $ipconf_entry_addr, $ipconf_entry_mask) = create_cidr_inputs($cidr);
- my $device_cb = Gtk3::ComboBoxText->new();
+ my $device_model = Gtk3::ListStore->new('Glib::String', 'Glib::String');
+ my $device_cb = Gtk3::ComboBox->new_with_model($device_model);
$device_cb->set_active(0);
$device_cb->set_visible(1);
+ my $icon_cell = Gtk3::CellRendererText->new();
+ $device_cb->pack_start($icon_cell, 0);
+ $device_cb->add_attribute($icon_cell, 'text', 0);
+ $icon_cell->set_property('foreground', 'green');
+
+ my $cell = Gtk3::CellRendererText->new();
+ $device_cb->pack_start($cell, 0);
+ $device_cb->add_attribute($cell, 'text', 1);
+
my $get_device_desc = sub {
my $iface = shift;
return "$iface->{name} - $iface->{mac} ($iface->{driver})";
my $i = 0;
for my $index (sort keys $ipconf->{ifaces}->%*) {
my $iface = $ipconf->{ifaces}->{$index};
- $device_cb->append_text($get_device_desc->($iface));
+ my $iter = $device_model->append();
+ my $symbol = "$iface->{state}" eq "UP" ? "\x{25CF}" : ' ';
+ $device_model->set($iter,
+ 0 => $symbol,
+ 1 => $get_device_desc->($iface),
+ );
$device_active_map->{$i} = $index;
$device_active_reverse_map->{$iface->{name}} = $i;
if ($ipconf_first_view && $index == $ipconf->{default}) {
$vbox->pack_start($devicebox, 0, 0, 2);
my $fqdn = Proxmox::Install::Config::get_fqdn();
- my $hn = $fqdn // "$iso_env->{product}." . ($ipconf->{domain} // "example.invalid");
+ my $hostname = $run_env->{network}->{hostname} || $iso_env->{product};
+ my $domain = $ipconf->{domain} || "example.invalid";
+ $fqdn //= "$hostname.$domain";
- my ($hostbox, $hostentry) = create_text_input($hn, 'Hostname (FQDN):');
+ my ($hostbox, $hostentry) = create_text_input($fqdn, 'Hostname (FQDN):');
$vbox->pack_start($hostbox, 0, 0, 2);
$vbox->pack_start($cidr_box, 0, 0, 2);
$text =~ s/^\s+//;
$text =~ s/\s+$//;
- my $namere = "([a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?)";
-
# Debian does not support purely numeric hostnames
if ($text && $text =~ /^[0-9]+(?:\.|$)/) {
Proxmox::UI::message("Purely numeric hostnames are not allowed.");
return;
}
- if ($text && $text =~ m/^(${namere}\.)*${namere}$/ && $text !~ m/.example.invalid$/ &&
- $text =~ m/^([^\.]+)\.(\S+)$/) {
+ if ($text
+ && $text =~ m/^${Proxmox::Sys::Net::FQDN_RE}$/
+ && $text !~ m/.example.invalid$/
+ && $text =~ m/^([^\.]+)\.(\S+)$/
+ ) {
Proxmox::Install::Config::set_hostname($1);
Proxmox::Install::Config::set_domain($2);
} else {
$text = $ipconf_entry_dns->get_text();
my ($dns_ip, $dns_ip_version) = parse_ip_address($text);
if (!defined($dns_ip) || $dns_ip_version != $ipversion) {
- my $msg = defined($gateway_ip)
- ? "DNS and host IP version must not differ (IPv$gateway_ip_version != IPv$ipversion)."
+ my $msg = defined($dns_ip)
+ ? "DNS and host IP version must not differ (IPv$dns_ip_version != IPv$ipversion)."
: "DNS IP is not valid.";
Proxmox::UI::message($msg);
$ipconf_entry_dns->grab_focus();
my $cached_disks = get_cached_disks();
my $disk_count = scalar(@$cached_disks);
for (my $i = 0; $i < $disk_count; $i++) {
- next if !Proxmox::Install::Config::get_disk_selection($i);
- my $cur_hd = $cached_disks->[$i];
+ my $cur_hd = $gtk_state->{disk_selection}->{$i} // next;
my $disksize = int(@$cur_hd[2] / (2 * 1024 * 1024.0)); # size in GB
$hdsize //= $disksize;
$hdsize = $disksize if $disksize < $hdsize;
my $w = shift;
my $diskid = $w->{pve_disk_id};
my $a = $w->get_active - 1;
- Proxmox::Install::Config::set_disk_selection($diskid, $a >= 0);
+ $gtk_state->{disk_selection}->{$diskid} = ($a >= 0) ? $cached_disks->[$a] : undef;
for my $btn (@$hdsize_buttons) {
update_hdsize_adjustment($btn->get_adjustment());
}
$disk_selector->set_active ($i+1) if $cached_disks->[$i];
} else {
my $hdind = 0;
- if (Proxmox::Install::Config::get_disk_selection($i)) {
- my $cur_hd = $cached_disks->[$i];
+ if (my $cur_hd = $gtk_state->{disk_selection}->{$i}) {
foreach my $hd (@$cached_disks) {
if (@$hd[1] eq @$cur_hd[1]) {
$disk_selector->set_active($hdind+1);
$spinbutton_copies->set_value($copies);
push @$labeled_widgets, "copies", $spinbutton_copies;
+ if ($iso_env->{product} eq 'pve') {
+ my $total_memory = Proxmox::Install::RunEnv::get('total_memory');
+
+ my $spinbutton_arc_max = Gtk3::SpinButton->new_with_range(
+ $Proxmox::Install::RunEnv::ZFS_ARC_MIN_SIZE_MIB, $total_memory, 1);
+ $spinbutton_arc_max->set_tooltip_text('Maximum ARC size in megabytes');
+ $spinbutton_arc_max->signal_connect('value-changed' => sub {
+ my $w = shift;
+ Proxmox::Install::Config::set_zfs_opt('arc_max', $w->get_value_as_int());
+ });
+ my $arc_max = Proxmox::Install::Config::get_zfs_opt('arc_max');
+ $spinbutton_arc_max->set_value($arc_max);
+ push @$labeled_widgets, "ARC max size", $spinbutton_arc_max;
+ }
+
push @$labeled_widgets, "hdsize", $hdsize_btn;
return $create_label_widget_grid->($labeled_widgets);;
};
$dialog->destroy();
}
+sub apply_raid_disk_selection {
+ Proxmox::Install::Config::set_key('disk_selection', {}); # reset
+ for my $order (sort keys $gtk_state->{disk_selection}->%*) {
+ my $disk = $gtk_state->{disk_selection}->{$order} // next;
+ Proxmox::Install::Config::set_disk_selection($order, $disk->[0]);
+ }
+}
+
my $last_hd_selected = 0;
sub create_hdsel_view {
set_next(undef, sub {
my $filesys = Proxmox::Install::Config::get_filesys();
if ($filesys =~ m/zfs/) {
+ apply_raid_disk_selection();
my ($devlist) = eval { Proxmox::Install::get_zfs_raid_setup() };
if (my $err = $@) {
Proxmox::UI::message("Warning: $err\nPlease fix ZFS setup first.");
}
$target_hds = [ map { $_->[1] } @$devlist ];
} elsif ($filesys =~ m/btrfs/) {
+ apply_raid_disk_selection();
my ($devlist) = eval { Proxmox::Install::get_btrfs_raid_setup() };
if (my $err = $@) {
Proxmox::UI::message("Warning: $err\nPlease fix BTRFS setup first.");
"See 'System Requirements' in the $iso_env->{cfg}->{fullname} documentation.");
}
- 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(
- "No support for hardware-accelerated KVM virtualization detected.\n\n"
- ."Check BIOS settings for Intel VT / AMD-V / SVM."
- );
- }
+ if ($iso_env->{product} eq 'pve' && !$run_env->{hvm_supported}) {
+ Proxmox::UI::error(
+ "No support for hardware-accelerated KVM virtualization detected.\n\n"
+ ."Check BIOS settings for Intel VT / AMD-V / SVM."
+ );
}
Proxmox::UI::display_html('license.htm', sub {
set_next("I a_gree", \&create_hdsel_view);
}
+log_info("initializing GTK and creating main window...");
Gtk3::init();
-create_main_window ();
+create_main_window();
my $initial_error = 0;
projects / pve-installer.git / blobdiff