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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 040259B5C3 for ; Wed, 18 Oct 2023 10:18:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CDB3EBCDA for ; Wed, 18 Oct 2023 10:18: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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 18 Oct 2023 10:18: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 841F442906 for ; Wed, 18 Oct 2023 10:18:54 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Wed, 18 Oct 2023 10:17:19 +0200 Message-ID: <20231018081752.214251-1-c.heiss@proxmox.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.024 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [runenv.pm] Subject: [pve-devel] [PATCH installer] run env: always re-create run env file in test mode 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, 18 Oct 2023 08:18:56 -0000 When debugging or otherwise deliberately running the `dump-env` low-level installer command in test mode, chances are that you'd want the run env file to be re-created as well. No impact on the normal installation flow. Signed-off-by: Christoph Heiss --- Noticed over time that I have to run `rm [..]/run/proxmox-installer/run-env-info.json` way to often. Also, the fact that this file is cached is probably not that obvious to anyone who doesn't know the installer by heart. Proxmox/Install/RunEnv.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Proxmox/Install/RunEnv.pm b/Proxmox/Install/RunEnv.pm index 9878f55..19b5387 100644 --- a/Proxmox/Install/RunEnv.pm +++ b/Proxmox/Install/RunEnv.pm @@ -241,7 +241,7 @@ my sub detect_country_tracing_to : prototype($$) { sub query_installation_environment : prototype() { # check first if somebody already cached this for us and re-use that my $run_env_file = Proxmox::Install::ISOEnv::get('run-env-cache-file'); - if (-f "$run_env_file") { + if (-f "$run_env_file" && !Proxmox::Install::ISOEnv::is_test_mode()) { log_info("re-using cached runtime env from $run_env_file"); my $cached_env = eval { my $run_env_raw = Proxmox::Sys::File::file_read_all($run_env_file); -- 2.42.0