From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id DB78D1FF170 for ; Tue, 17 Dec 2024 16:23:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4D2DA4A49; Tue, 17 Dec 2024 16:23:50 +0100 (CET) From: Maximiliano Sandoval To: pve-devel@lists.proxmox.com Date: Tue, 17 Dec 2024 16:23:16 +0100 Message-Id: <20241217152316.381557-3-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241217152316.381557-1-m.sandoval@proxmox.com> References: <20241217152316.381557-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.105 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 Subject: [pve-devel] [PATCH installer 3/3] fix #2502: proxinstall: set cidr text manually 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" Instead of relying on the device_change_handler callback (which saves the config) we manually set the text to the right value. Signed-off-by: Maximiliano Sandoval --- proxinstall | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/proxinstall b/proxinstall index cb74cc2..2f393f2 100755 --- a/proxinstall +++ b/proxinstall @@ -319,8 +319,6 @@ sub create_cidr_inputs { return ($label, $hbox, $ip_el, $cidr_el); } -my $ipconf_first_view = 1; - my $create_basic_grid = sub { my $grid = Gtk3::Grid->new(); $grid->set_visible(1); @@ -392,6 +390,8 @@ sub create_ipconf_view { }; my $active_device_pos = 0; + my $addr = undef; + my $mask = undef; my $i = 0; for my $index (sort keys $ipconf->{ifaces}->%*) { @@ -404,9 +404,10 @@ sub create_ipconf_view { ); $device_active_map->{$i} = $index; $device_active_reverse_map->{$iface->{name}} = $i; - if ($ipconf_first_view && $index == $ipconf->{default}) { + if ($index == $ipconf->{default}) { $active_device_pos = $i; - $ipconf_first_view = 0; + $addr = $iface->{inet}->{addr} || $iface->{inet6}->{addr}; + $mask = $iface->{inet}->{prefix} || $iface->{inet6}->{prefix}; } $i++; } @@ -415,8 +416,17 @@ sub create_ipconf_view { $active_device_pos = $device_active_reverse_map->{$nic}; } - $device_cb->signal_connect('changed' => $device_change_handler); + if (my $cidr = Proxmox::Install::Config::get_cidr()) { + my ($default_ip, $default_mask) = split('/', $cidr); + $addr = $default_ip if $default_ip; + $mask = $default_mask if $default_mask; + } + $device_cb->set_active($active_device_pos); + $ipconf_entry_addr->set_text($addr) if $addr; + $ipconf_entry_mask->set_text($mask) if $mask; + + $device_cb->signal_connect('changed' => $device_change_handler); my $label = Gtk3::Label->new("Management Interface"); $label->set_size_request(150, -1); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel