From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7444D9D419 for ; Wed, 25 Oct 2023 18:00:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3EBCC16943 for ; Wed, 25 Oct 2023 18:00:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 25 Oct 2023 18:00:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F33C8465C0 for ; Wed, 25 Oct 2023 18:00:13 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 25 Oct 2023 18:00:04 +0200 Message-Id: <20231025160011.3617524-6-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231025160011.3617524-1-a.lauterer@proxmox.com> References: <20231025160011.3617524-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.076 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 05/12] common: disk_checks: make functions public 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: , X-List-Received-Date: Wed, 25 Oct 2023 16:00:45 -0000 Signed-off-by: Aaron Lauterer --- proxmox-installer-common/src/disk_checks.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/proxmox-installer-common/src/disk_checks.rs b/proxmox-installer-common/src/disk_checks.rs index 15b5928..bcf2e21 100644 --- a/proxmox-installer-common/src/disk_checks.rs +++ b/proxmox-installer-common/src/disk_checks.rs @@ -8,7 +8,7 @@ use crate::setup::BootType; /// # Arguments /// /// * `disks` - A list of disks to check for duplicates. -fn check_for_duplicate_disks(disks: &[Disk]) -> Result<(), &Disk> { +pub fn check_for_duplicate_disks(disks: &[Disk]) -> Result<(), &Disk> { let mut set = HashSet::new(); for disk in disks { @@ -26,7 +26,7 @@ fn check_for_duplicate_disks(disks: &[Disk]) -> Result<(), &Disk> { /// /// * `disks` - A list of disks to check the lenght of. /// * `min` - Minimum number of disks -fn check_raid_min_disks(disks: &[Disk], min: usize) -> Result<(), String> { +pub fn check_raid_min_disks(disks: &[Disk], min: usize) -> Result<(), String> { if disks.len() < min { Err(format!("Need at least {min} disks")) } else { @@ -41,7 +41,7 @@ fn check_raid_min_disks(disks: &[Disk], min: usize) -> Result<(), String> { /// /// * `runinfo` - `RuntimeInfo` instance of currently running system /// * `disks` - List of disks designated as bootdisk targets. -fn check_disks_4kn_legacy_boot(boot_type: BootType, disks: &[Disk]) -> Result<(), &str> { +pub fn check_disks_4kn_legacy_boot(boot_type: BootType, disks: &[Disk]) -> Result<(), &str> { let is_blocksize_4096 = |disk: &Disk| disk.block_size.map(|s| s == 4096).unwrap_or(false); if boot_type == BootType::Bios && disks.iter().any(is_blocksize_4096) { @@ -58,7 +58,7 @@ fn check_disks_4kn_legacy_boot(boot_type: BootType, disks: &[Disk]) -> Result<() /// /// * `level` - The targeted ZFS RAID level by the user. /// * `disks` - List of disks designated as RAID targets. -fn check_zfs_raid_config(level: ZfsRaidLevel, disks: &[Disk]) -> Result<(), String> { +pub fn check_zfs_raid_config(level: ZfsRaidLevel, disks: &[Disk]) -> Result<(), String> { // See also Proxmox/Install.pm:get_zfs_raid_setup() let check_mirror_size = |disk1: &Disk, disk2: &Disk| { @@ -117,7 +117,7 @@ fn check_zfs_raid_config(level: ZfsRaidLevel, disks: &[Disk]) -> Result<(), Stri /// /// * `level` - The targeted Btrfs RAID level by the user. /// * `disks` - List of disks designated as RAID targets. -fn check_btrfs_raid_config(level: BtrfsRaidLevel, disks: &[Disk]) -> Result<(), String> { +pub fn check_btrfs_raid_config(level: BtrfsRaidLevel, disks: &[Disk]) -> Result<(), String> { // See also Proxmox/Install.pm:get_btrfs_raid_setup() match level { -- 2.39.2