From 1fcb0d6ca2fcdfff0e4e673526480865c99e29cc Mon Sep 17 00:00:00 2001 From: Ioannis Bonatakis Date: Wed, 21 Feb 2024 12:03:48 +0100 Subject: [PATCH] Fix warnings about uninitialized value $device Remove warnings on autoinst-logs about the uninitialized value of the `$device`. When `$device` is initialized is gets the non-whitespace flag to pass to the grep --- lib/mm_network.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/mm_network.pm b/lib/mm_network.pm index de39570ed354..b98339bccb92 100644 --- a/lib/mm_network.pm +++ b/lib/mm_network.pm @@ -58,11 +58,11 @@ sub configure_static_ip { my $ip = $args{ip}; my $mtu = $args{mtu} // get_var('MM_MTU', 1380); my $is_nm = $args{is_nm} // is_networkmanager(); - my $device = $args{device}; + my $device = $args{device} // '\S'; if ($is_nm) { my $nm_id; - my $nm_list = script_output("nmcli -t -f DEVICE,NAME c | grep -v ^lo: | grep '$device' | head -n1"); + my $nm_list = script_output("nmcli -t -f DEVICE,NAME c | grep -v '^lo:' | grep -e '$device' | head -n1"); ($device, $nm_id) = split(':', $nm_list); record_info('set_ip', "Device: $device\n NM ID: $nm_id\nIP: $ip\nMTU: $mtu"); @@ -105,11 +105,11 @@ sub configure_dhcp { sub configure_default_gateway { my (%args) = @_; my $is_nm = $args{is_nm} // is_networkmanager(); - my $device = $args{device}; + my $device = $args{device} // '\S'; if ($is_nm) { my $nm_id; # When $device is not specified grep just does nothing and first connection is selected - my $nm_list = script_output("nmcli -t -f DEVICE,NAME c | grep -v ^lo: | grep '$device' | head -n1"); + my $nm_list = script_output("nmcli -t -f DEVICE,NAME c | grep -v '^lo:' | grep -e '$device' | head -n1"); ($device, $nm_id) = split(':', $nm_list); assert_script_run "nmcli connection modify '$nm_id' ipv4.gateway 10.0.2.2";