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 BD6091FF161 for ; Tue, 13 Aug 2024 18:16:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3AB1370EB; Tue, 13 Aug 2024 18:16:29 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 13 Aug 2024 18:15:34 +0200 Message-ID: <20240813161538.1660140-6-c.heiss@proxmox.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240813161538.1660140-1-c.heiss@proxmox.com> References: <20240813161538.1660140-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH installer v2 5/5] 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 --- Changes v1 -> v2: * squashed in separate tests patch proxmox-auto-installer/src/answer.rs | 6 ++++- proxmox-auto-installer/src/utils.rs | 6 ++++- .../tests/resources/parse_answer/btrfs.json | 24 +++++++++++++++++++ .../tests/resources/parse_answer/btrfs.toml | 17 +++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/btrfs.json create mode 100644 proxmox-auto-installer/tests/resources/parse_answer/btrfs.toml diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs index d691da1..fd0ed0d 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}; @@ -270,6 +273,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 ae7dbbd..9e86053 100644 --- a/proxmox-auto-installer/src/utils.rs +++ b/proxmox-auto-installer/src/utils.rs @@ -11,7 +11,8 @@ use crate::{ use proxmox_installer_common::{ options::{FsType, NetworkOptions, ZfsChecksumOption, ZfsCompressOption}, setup::{ - InstallConfig, InstallRootPassword, InstallZfsOption, LocaleInfo, RuntimeInfo, SetupInfo, + InstallBtrfsOption, InstallConfig, InstallRootPassword, InstallZfsOption, LocaleInfo, + RuntimeInfo, SetupInfo, }, }; use serde::{Deserialize, Serialize}; @@ -394,6 +395,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) diff --git a/proxmox-auto-installer/tests/resources/parse_answer/btrfs.json b/proxmox-auto-installer/tests/resources/parse_answer/btrfs.json new file mode 100644 index 0000000..0330a38 --- /dev/null +++ b/proxmox-auto-installer/tests/resources/parse_answer/btrfs.json @@ -0,0 +1,24 @@ +{ + "autoreboot": 1, + "cidr": "192.168.1.114/24", + "country": "at", + "dns": "192.168.1.254", + "domain": "testinstall", + "disk_selection": { + "6": "6", + "7": "7" + }, + "filesys": "btrfs (RAID1)", + "gateway": "192.168.1.1", + "hdsize": 80.0, + "existing_storage_auto_rename": 1, + "hostname": "pveauto", + "keymap": "de", + "mailto": "mail@no.invalid", + "mngmt_nic": "eno1", + "root_password": { "plain": "123456" }, + "timezone": "Europe/Vienna", + "btrfs_opts": { + "compress": "zlib" + } +} diff --git a/proxmox-auto-installer/tests/resources/parse_answer/btrfs.toml b/proxmox-auto-installer/tests/resources/parse_answer/btrfs.toml new file mode 100644 index 0000000..8fcd27d --- /dev/null +++ b/proxmox-auto-installer/tests/resources/parse_answer/btrfs.toml @@ -0,0 +1,17 @@ +[global] +keyboard = "de" +country = "at" +fqdn = "pveauto.testinstall" +mailto = "mail@no.invalid" +timezone = "Europe/Vienna" +root_password = "123456" + +[network] +source = "from-dhcp" + +[disk-setup] +filesystem = "btrfs" +btrfs.raid = "raid1" +btrfs.compress = "zlib" +btrfs.hdsize = 80 +disk_list = ["sda", "sdb"] -- 2.45.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel