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 5F4001FF168 for ; Tue, 26 Nov 2024 14:27:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 727011AE5; Tue, 26 Nov 2024 14:27:57 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Tue, 26 Nov 2024 14:27:44 +0100 Message-ID: <20241126132747.898671-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [utils.rs] Subject: [pve-devel] [PATCH installer] auto: do not allow btrfs as root-fs if not enabled in the setup 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" Add a check such that this combination is not possible, if not enabled for the specific iso. Signed-off-by: Christoph Heiss --- proxmox-auto-installer/src/utils.rs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs index 2be81ea..6482966 100644 --- a/proxmox-auto-installer/src/utils.rs +++ b/proxmox-auto-installer/src/utils.rs @@ -281,6 +281,16 @@ fn get_first_selected_disk(config: &InstallConfig) -> usize { .expect("could not parse key to usize") } +fn verify_filesystem_settings(answer: &Answer, setup_info: &SetupInfo) -> Result<()> { + info!("Verifying filesystem settings"); + + if answer.disks.fs_type.is_btrfs() && !setup_info.config.enable_btrfs { + bail!("BTRFS not supported as root filesystem"); + } + + Ok(()) +} + fn verify_locale_settings(answer: &Answer, locales: &LocaleInfo) -> Result<()> { info!("Verifying locale settings"); if !locales @@ -345,6 +355,9 @@ pub fn parse_answer( setup_info: &SetupInfo, ) -> Result { info!("Parsing answer file"); + + verify_filesystem_settings(answer, setup_info)?; + info!("Setting File system"); let filesystem = answer.disks.fs_type; info!("File system selected: {}", filesystem); -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel