diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm index e6f5893..3ab3023 100644 --- a/Proxmox/Install/RunEnv.pm +++ b/Proxmox/Install/RunEnv.pm @@ -330,7 +330,8 @@ our $ZFS_ARC_SYSMEM_PERCENTAGE = 0.1; # use 10% of available system memory by de # Calculates the default upper limit for the ZFS ARC size. # Returns the default ZFS maximum ARC size in MiB. sub default_zfs_arc_max { - # Use ZFS default on non-PVE + # For products other the PVE, just let ZFS decide on its own. Setting `0` + # causes the installer to skip writing the `zfs_arc_max` module parameter. return 0 if Proxmox::Install::ISOEnv::get('product') ne 'pve'; my $default_mib = get('total_memory') * $ZFS_ARC_SYSMEM_PERCENTAGE; diff --git a/proxinstall b/proxinstall index 877e29c..8168529 100755 --- a/proxinstall +++ b/proxinstall @@ -1139,20 +1139,20 @@ my $create_raid_advanced_grid = sub { $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 $total_memory = Proxmox::Install::RunEnv::get('total_memory'); + my $arc_max = Proxmox::Install::Config::get_zfs_opt('arc_max') || ($total_memory * 0.5); - 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, 'MiB']; - } + my $arc_max_adjustment = Gtk3::Adjustment->new( + $arc_max, $Proxmox::Install::RunEnv::ZFS_ARC_MIN_SIZE_MIB, + $total_memory, 1, 10, 0); + my $spinbutton_arc_max = Gtk3::SpinButton->new($arc_max_adjustment, 1, 0); + $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()); + }); + + push @$labeled_widgets, ['ARC max size', $spinbutton_arc_max, 'MiB']; push @$labeled_widgets, ['hdsize', $hdsize_btn, 'GB']; return $create_label_widget_grid->($labeled_widgets);;