From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
	by lore.proxmox.com (Postfix) with ESMTPS id 317A81FF38E
	for <inbox@lore.proxmox.com>; Tue, 14 May 2024 10:14:26 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id F012F9BA;
	Tue, 14 May 2024 10:14:34 +0200 (CEST)
Date: Tue, 14 May 2024 10:14:28 +0200
From: Christoph Heiss <c.heiss@proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Message-ID: <nezengnskqun6bg27rtuiqxpsnypdw5i2ryai2mkm3hzn2dxbe@7s45i53gy2h4>
References: <20240513121357.1270503-1-c.heiss@proxmox.com>
 <20240513121357.1270503-4-c.heiss@proxmox.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20240513121357.1270503-4-c.heiss@proxmox.com>
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.505 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
 MISSING_HEADERS         1.021 Missing To: header
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
 http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
 information. [install.pm]
Subject: Re: [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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

On Mon, May 13, 2024 at 02:13:52PM +0200, Christoph Heiss wrote:
> Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
> ---
>  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}";
> +	    }

That was supposed to be squashed into the previous patch, whoops!
I'll send a v2 soon if nothing else comes up, sorry for the noise.


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel