From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 897F01FF398 for ; Mon, 13 May 2024 14:14:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8A88C1508E; Mon, 13 May 2024 14:14:40 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Mon, 13 May 2024 14:13:54 +0200 Message-ID: <20240513121357.1270503-6-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 5/6] fix #5250: auto-installer: 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-auto-installer/src/answer.rs | 6 +++++- proxmox-auto-installer/src/utils.rs | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs index aab7198..add36a3 100644 --- a/proxmox-auto-installer/src/answer.rs +++ b/proxmox-auto-installer/src/answer.rs @@ -1,6 +1,9 @@ use clap::ValueEnum; use proxmox_installer_common::{ - options::{BtrfsRaidLevel, FsType, ZfsChecksumOption, ZfsCompressOption, ZfsRaidLevel}, + options::{ + BtrfsCompressOption, BtrfsRaidLevel, FsType, ZfsChecksumOption, ZfsCompressOption, + ZfsRaidLevel, + }, utils::{CidrAddress, Fqdn}, }; use serde::{Deserialize, Serialize}; @@ -269,6 +272,7 @@ pub struct LvmOptions { pub struct BtrfsOptions { pub hdsize: Option, pub raid: Option, + pub compress: Option, } #[derive(Clone, Deserialize, Serialize, Debug, PartialEq)] diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs index 30b6196..b08c617 100644 --- a/proxmox-auto-installer/src/utils.rs +++ b/proxmox-auto-installer/src/utils.rs @@ -10,7 +10,9 @@ use crate::{ }; use proxmox_installer_common::{ options::{FsType, NetworkOptions, ZfsChecksumOption, ZfsCompressOption}, - setup::{InstallConfig, InstallZfsOption, LocaleInfo, RuntimeInfo, SetupInfo}, + setup::{ + InstallBtrfsOption, InstallConfig, InstallZfsOption, LocaleInfo, RuntimeInfo, SetupInfo, + }, }; use serde::{Deserialize, Serialize}; @@ -377,6 +379,9 @@ pub fn parse_answer( config.hdsize = btrfs .hdsize .unwrap_or(runtime_info.disks[first_selected_disk].size); + config.btrfs_opts = Some(InstallBtrfsOption { + compress: btrfs.compress.unwrap_or_default(), + }) } } Ok(config) -- 2.44.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel