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 9009E1FF16F for ; Fri, 15 Nov 2024 11:33:29 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E1835109F0; Fri, 15 Nov 2024 11:33:29 +0100 (CET) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Fri, 15 Nov 2024 11:32:34 +0100 Message-ID: <20241115103248.205313-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.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. [utils.rs] Subject: [pve-devel] [PATCH installer] auto-installer: fix: add default value for 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" This ensure backwards-compatibility of older version of proxmox-auto-install-assistant and newer ISOs/auto-installer version. Otherwise, it fails with a "missing key `partition_label`" error on start. While proxmox-auto-install-assistant writes out that field by default now, it will be missing for ISOs prepared with older versions of that tool. Fix it by providing a default label, such that it always has a sensible value. Fixes: 2e89c07 ("auto-install-assistant: add new parameter to specify partition label") Reported-by: Timothy Nicholson Signed-off-by: Christoph Heiss --- proxmox-auto-installer/src/utils.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proxmox-auto-installer/src/utils.rs b/proxmox-auto-installer/src/utils.rs index 83f3f12..dd686c0 100644 --- a/proxmox-auto-installer/src/utils.rs +++ b/proxmox-auto-installer/src/utils.rs @@ -87,11 +87,16 @@ pub struct HttpOptions { #[serde(rename_all = "lowercase", deny_unknown_fields)] pub struct AutoInstSettings { pub mode: FetchAnswerFrom, + #[serde(default = "default_partition_label")] pub partition_label: String, #[serde(default)] pub http: HttpOptions, } +fn default_partition_label() -> String { + "proxmox-ais".to_owned() +} + #[derive(Deserialize, Debug)] struct IpLinksUdevInfo { ifname: String, -- 2.47.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel