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 447719ABB6 for ; Fri, 17 Nov 2023 18:31:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2004A375E2 for ; Fri, 17 Nov 2023 18:30:35 +0100 (CET) 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 ; Fri, 17 Nov 2023 18:30:34 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DCFA24023D for ; Fri, 17 Nov 2023 18:30:33 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 18:30:23 +0100 Message-Id: <20231117173023.1484541-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.089 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. [main.rs] Subject: [pve-devel] [PATCH installer] tui: fix interface sort order 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, 17 Nov 2023 17:31:05 -0000 currently when multiple nics are present in a system the TUI sometimes selects the wrong interface (not the one that has the default gateway/dhcp lease) I assume this is due to HashMap's values yielding an iterator in arbitrary order Signed-off-by: Stoiko Ivanov --- sadly a bit difficult to test due to the randomnes - but at least the 3 tests on a VM were consistent. proxmox-tui-installer/src/main.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/proxmox-tui-installer/src/main.rs b/proxmox-tui-installer/src/main.rs index 4c14482..85b6811 100644 --- a/proxmox-tui-installer/src/main.rs +++ b/proxmox-tui-installer/src/main.rs @@ -488,16 +488,23 @@ fn network_dialog(siv: &mut Cursive) -> InstallerView { let state = siv.user_data::().unwrap(); let options = &state.options.network; let ifaces = state.runtime_info.network.interfaces.values(); - let ifnames = ifaces + let ifname_entries = ifaces .clone() .map(|iface| (iface.render(), iface.name.clone())); - let mut ifaces_selection = SelectView::new().popup().with_all(ifnames.clone()); + let mut ifaces_selection = SelectView::new().popup().with_all(ifname_entries.clone()); + + let mut ifnames = ifaces + .clone() + .map(|iface| iface.name.clone()) + .collect::>(); + ifnames.sort(); ifaces_selection.sort(); ifaces_selection.set_selection( ifnames + .iter() .clone() - .position(|iface| iface.1 == options.ifname) + .position(|iface| *iface == options.ifname) .unwrap_or(ifaces.len() - 1), ); -- 2.39.2