From 70281715c665d6fa29b376aa9df6ec6ffa380e1e Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 14 Apr 2021 12:06:03 +0200 Subject: [PATCH] ssh_exec_channel.run: fix server IP pattern This patch adjusts the matching of the IP address such that the external IP address is used as opposed the the NAT-local address. It is follow-up fix of the conversion to the uplink session interface. Issue #3961 --- repos/gems/run/ssh_exec_channel.run | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/repos/gems/run/ssh_exec_channel.run b/repos/gems/run/ssh_exec_channel.run index 2f0969b7b9..8f50aa60e2 100644 --- a/repos/gems/run/ssh_exec_channel.run +++ b/repos/gems/run/ssh_exec_channel.run @@ -273,18 +273,17 @@ build_boot_image $boot_modules append qemu_args " -m 512 -nographic " append_qemu_nic_args "hostfwd=tcp::5555-:22" -set lxip_match_string "ipaddr=(\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+).*\n" +set nic_router_match_string ".uplink. dynamic IP config. interface (\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+).*\n" if {[get_cmd_switch --autopilot]} { - run_genode_until $lxip_match_string 60 + run_genode_until $nic_router_match_string 60 set serial_id [output_spawn_id] if {[have_include "power_on/qemu"]} { set host "localhost" set port "5555" } else { - regexp $lxip_match_string $output all host - puts "" + regexp $nic_router_match_string $output all host set port "22" } # wait for ssh_terminal to come up