From 7fd99ddc0bcba9ec85d17039c0abcfb33c442e2a Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 1 Sep 2004 05:11:07 +0000 Subject: revert titi fix, do not return random interface if internet connection is not configured --- perl-install/network/tools.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'perl-install/network/tools.pm') diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index d77a934e1..338cbf4c8 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -270,9 +270,7 @@ sub get_internet_connection { my ($netc, $intf, $o_gw_intf) = @_; my @routes = `$::prefix/sbin/ip route show`; my ($gw_intf, $is_up, $gw_address); - $gw_intf = $o_gw_intf || get_default_gateway_interface($netc, $intf) || - if_(`$::prefix/sbin/ip route show` =~ m!^[0-9a-f./]*\s+dev\s+(\S+)!m, $1) - or return; + $gw_intf = $o_gw_intf || get_default_gateway_interface($netc, $intf) or return; $is_up = to_bool(grep { /\s+dev\s+$gw_intf(?:\s+|$)/ } @routes); ($gw_address) = join('', @routes) =~ /^default\s+via\s+(\S+).*\s+dev\s+$gw_intf(?:\s+|$)/m; return $gw_intf, $is_up, $gw_address, $netc->{dnsServer}; -- cgit v1.2.1