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 63868D50D for ; Fri, 14 Jul 2023 11:31:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3B5462E20F for ; Fri, 14 Jul 2023 11:30:55 +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 ; Fri, 14 Jul 2023 11:30:54 +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 8052D40122 for ; Fri, 14 Jul 2023 11:30:54 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Fri, 14 Jul 2023 11:29:47 +0200 Message-ID: <20230714092948.251116-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.060 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [setup.rs, main.rs] Subject: [pve-devel] [PATCH installer] tui: use EULA path from ISO info instead of hard-coding 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: Fri, 14 Jul 2023 09:31:25 -0000 .. in the same fashion as the GUI installer. See also proxinstall:create_intro_view() for reference. Signed-off-by: Christoph Heiss --- proxmox-tui-installer/src/main.rs | 10 ++++++---- proxmox-tui-installer/src/setup.rs | 17 ++++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index 42f278b..b87e14f 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -391,9 +391,11 @@ fn abort_install_button() -> Button { Button::new("Abort", trigger_abort_install_dialog) } -fn get_eula() -> String { - // TODO: properly using info from Proxmox::Install::Env::setup() - std::fs::read_to_string("/cdrom/EULA") +fn get_eula(setup: &SetupInfo) -> String { + let mut path = setup.locations.iso.clone(); + path.push("EULA"); + + std::fs::read_to_string(path) .unwrap_or_else(|_| "< Debug build - ignoring non-existing EULA >".to_owned()) } @@ -417,7 +419,7 @@ fn license_dialog(siv: &mut Cursive) -> InstallerView { TextView::new("END USER LICENSE AGREEMENT (EULA)").center(), )) .child(Panel::new(ScrollView::new( - TextView::new(get_eula()).center(), + TextView::new(get_eula(&state.setup_info)).center(), ))) .child(PaddedView::lrtb(1, 1, 1, 0, bbar)); diff --git a/proxmox-tui-installer/src/setup.rs b/proxmox-tui-installer/src/setup.rs index 8c64c65..5e07f36 100644 --- a/proxmox-tui-installer/src/setup.rs +++ b/proxmox-tui-installer/src/setup.rs @@ -1,4 +1,12 @@ -use std::{cmp, collections::HashMap, fmt, fs::File, io::BufReader, net::IpAddr, path::Path}; +use std::{ + cmp, + collections::HashMap, + fmt, + fs::File, + io::BufReader, + net::IpAddr, + path::{Path, PathBuf}, +}; use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; @@ -43,12 +51,19 @@ pub struct IsoInfo { pub isorelease: String, } +/// Paths in the ISO environment containing installer data. +#[derive(Clone, Deserialize)] +pub struct IsoLocations { + pub iso: PathBuf, +} + #[derive(Clone, Deserialize)] pub struct SetupInfo { #[serde(rename = "product-cfg")] pub config: ProductConfig, #[serde(rename = "iso-info")] pub iso_info: IsoInfo, + pub locations: IsoLocations, } #[derive(Clone, Deserialize)] -- 2.41.0