diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index e1eb2430d..a3ab82898 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -222,14 +222,19 @@ if {[have_include "power_on/qemu"]} { run_genode_until {.*got IP address.*\n} 60 set serial_id [output_spawn_id] } else { - run_genode_until {\[init -> tcp_terminal\] listening on port 8888\.\.\.} 60 + # + # We have to look for 'got IP address' twice because tcp_terminal + # as well as noux_net will request one and we do not know the + # order in advance. + run_genode_until {.*got IP address.*} 60 set serial_id [output_spawn_id] + run_genode_until {.*got IP address.*\n} 10 $serial_id regexp {\[init -> noux_net\] .{1,5}got IP address [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $output noux_ip_addr - regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $noux_ip_addr noux_ip_addr + regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $noux_ip_addr noux_ip_addr regexp {\[init -> tcp_terminal\] .{1,5}got IP address [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $output serial_ip_addr - regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $serial_ip_addr serial_ip_addr + regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $serial_ip_addr serial_ip_addr # connect to Genode target and reading log output via network connection