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 71A1E1FF15E for ; Fri, 18 Oct 2024 13:59:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C0BB0317E3; Fri, 18 Oct 2024 13:59:52 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Fri, 18 Oct 2024 13:59:39 +0200 Message-ID: <20241018115943.813243-4-c.heiss@proxmox.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241018115943.813243-1-c.heiss@proxmox.com> References: <20241018115943.813243-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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [partition.rs] Subject: [pve-devel] [PATCH installer 3/4] fetch-answer: partition: also search for exact-matching partition label 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" While some filesystems - such as FAT(32) - might not supported/allow mixed-case labels, some implementations still handle them correctly, such as Linux. Thus, also search for that variant. Signed-off-by: Christoph Heiss --- .../src/fetch_plugins/partition.rs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/proxmox-fetch-answer/src/fetch_plugins/partition.rs b/proxmox-fetch-answer/src/fetch_plugins/partition.rs index 4472922..cbfe2d5 100644 --- a/proxmox-fetch-answer/src/fetch_plugins/partition.rs +++ b/proxmox-fetch-answer/src/fetch_plugins/partition.rs @@ -43,12 +43,22 @@ fn path_exists_logged(file_name: &str, search_path: &str) -> Option { } } -/// Searches for upper and lower case existence of the partlabel in the search_path +/// Searches for the exact case, upper and finally lower case existence of the partlabel in the +/// search_path, in that order. +/// +/// While some filesystems - such as FAT(32) - might not supported/allow mixed-case labels, some +/// implementations still handle them correctly, such as Linux. Thus, also search for that variant +/// first. /// /// # Arguments -/// * `partlabel_source` - Partition Label, used as upper and lower case +/// * `partlabel_source` - Partition Label, used for matching, in the exact, upper and lower case /// * `search_path` - Path where to search for the partition label fn scan_partlabels(partlabel: &str, search_path: &str) -> Result { + if let Some(path) = path_exists_logged(partlabel, search_path) { + info!("Found partition with label '{partlabel}'"); + return Ok(path); + } + let partlabel_upper_case = partlabel.to_uppercase(); if let Some(path) = path_exists_logged(&partlabel_upper_case, search_path) { info!("Found partition with label '{partlabel_upper_case}'"); @@ -61,7 +71,7 @@ fn scan_partlabels(partlabel: &str, search_path: &str) -> Result { return Ok(path); } - bail!("Could not detect upper or lower case labels for '{partlabel}'"); + bail!("Could not find partition for label '{partlabel}'"); } /// Will search and mount a partition/FS labeled PARTLABEL (proxmox-ais) in lower or uppercase -- 2.46.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel