From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E26971FF398 for ; Mon, 13 May 2024 14:14:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EBD7214DEA; Mon, 13 May 2024 14:14:09 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 13 May 2024 14:13:52 +0200 Message-ID: <20240513121357.1270503-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240513121357.1270503-1-c.heiss@proxmox.com> References: <20240513121357.1270503-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.005 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH installer 3/6] fix #5250: proxinstall: expose new btrfs `compress` option X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Christoph Heiss --- Proxmox/Install.pm | 7 +++++-- proxinstall | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm index f3bc5aa..60f38e5 100644 --- a/Proxmox/Install.pm +++ b/Proxmox/Install.pm @@ -1014,8 +1014,11 @@ sub extract_data { my $btrfs_opts = Proxmox::Install::Config::get_btrfs_opt(); my $mountopts = 'defaults'; - $mountopts .= ",compress=$btrfs_opts->{compress}" - if $btrfs_opts->{compress} ne 'off'; + if ($btrfs_opts->{compress} eq 'on') { + $mountopts .= ',compress'; + } elsif ($btrfs_opts->{compress} ne 'off') { + $mountopts .= ",compress=$btrfs_opts->{compress}"; + } $fstab .= "UUID=$fsuuid / btrfs $mountopts 0 1\n"; } else { diff --git a/proxinstall b/proxinstall index a6a4cfb..7180fe6 100755 --- a/proxinstall +++ b/proxinstall @@ -1160,6 +1160,21 @@ my $create_raid_advanced_grid = sub { my $create_btrfs_raid_advanced_grid = sub { my ($hdsize_btn) = @_; my $labeled_widgets = []; + + my $combo_compress = Gtk3::ComboBoxText->new(); + $combo_compress->set_tooltip_text("btrfs compression algorithm for boot volume"); + my $comp_opts = ["on", "off", "zlib", "lzo", "zstd"]; + foreach my $opt (@$comp_opts) { + $combo_compress->append($opt, $opt); + } + my $compress = Proxmox::Install::Config::get_btrfs_opt('compress') // 'off'; + $combo_compress->set_active_id($compress); + $combo_compress->signal_connect (changed => sub { + my $w = shift; + Proxmox::Install::Config::set_btrfs_opt('compress', $w->get_active_text()); + }); + push @$labeled_widgets, ['compress', $combo_compress]; + push @$labeled_widgets, ['hdsize', $hdsize_btn, 'GB']; return $create_label_widget_grid->($labeled_widgets);; }; -- 2.44.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel