From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 6D9451FF0B6 for ; Thu, 12 Nov 2026 15:12:35 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id E5A1B21695; Thu, 12 Nov 2026 15:12:29 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-perl-rs 04/26] pve-rs: oci: add `os` parameter to parse_and_extract_image Date: Thu, 12 Nov 2026 15:10:31 +0100 Message-ID: <20261112141109.137298-5-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261112141109.137298-1-f.schauer@proxmox.com> References: <20261112141109.137298-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794492745931 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.231 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: CQMVZRRRU7IBAEFMWCZPOHEKEX5M4KJA X-Message-ID-Hash: CQMVZRRRU7IBAEFMWCZPOHEKEX5M4KJA X-MailFrom: f.schauer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Signed-off-by: Filip Schauer --- pve-rs/src/bindings/oci.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pve-rs/src/bindings/oci.rs b/pve-rs/src/bindings/oci.rs index 30e74fd..11ac07f 100644 --- a/pve-rs/src/bindings/oci.rs +++ b/pve-rs/src/bindings/oci.rs @@ -13,6 +13,8 @@ pub mod pve_rs_oci { /// /// * `oci_tar_path` - Path to the OCI image tar archive /// * `rootfs_path` - Destination path where the rootfs will be extracted to + /// * `os` - Optional operating system used to pick the first matching manifest from a multi-arch + /// image index. If `None`, the first manifest will be used. /// * `arch` - Optional CPU architecture used to pick the first matching manifest from a multi-arch /// image index. If `None`, the first manifest will be used. /// @@ -24,11 +26,17 @@ pub mod pve_rs_oci { pub fn parse_and_extract_image( oci_tar_path: &str, rootfs_path: &str, + os: Option<&str>, arch: Option<&str>, ) -> Result { let arch = arch.map(Into::into); - proxmox_oci::parse_and_extract_image(oci_tar_path, rootfs_path, arch.as_ref()) - .map(|config| config.unwrap_or_default()) - .map_err(Into::into) + proxmox_oci::parse_and_extract_image( + oci_tar_path, + rootfs_path, + os.map(Into::into).as_ref(), + arch.as_ref(), + ) + .map(|config| config.unwrap_or_default()) + .map_err(Into::into) } } -- 2.47.3