summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-27 15:00:13 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-27 15:00:13 +0000
commit82ab154cc91bc4d2ceff3a207d119058d7d18454 (patch)
tree6672fcf0a848db5576c081493260d83051b8f0ca
parentb95218576ac49d2e496142b81d332309c1b27905 (diff)
downloaddrakx-82ab154cc91bc4d2ceff3a207d119058d7d18454.tar
drakx-82ab154cc91bc4d2ceff3a207d119058d7d18454.tar.gz
drakx-82ab154cc91bc4d2ceff3a207d119058d7d18454.tar.bz2
drakx-82ab154cc91bc4d2ceff3a207d119058d7d18454.tar.xz
drakx-82ab154cc91bc4d2ceff3a207d119058d7d18454.zip
I sux, fix priority
-rw-r--r--perl-install/network/tools.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 3410d2250..a35896766 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -248,10 +248,10 @@ sub get_default_gateway_interface {
`$::prefix/sbin/ip route show` =~ /^default.*\s+dev\s+(\S+)/m && $1 ||
$netc->{GATEWAYDEV} ||
$netc->{GATEWAY} && find_matching_interface($intf, $netc->{GATEWAY}) ||
- find { get_interface_type($intf->{$_}) eq 'adsl' } @intfs ||
- find { get_interface_type($intf->{$_}) eq 'isdn' && text2bool($intf->{$_}{DIAL_ON_IFUP}) } @intfs ||
- find { get_interface_type($intf->{$_}) eq 'modem' } @intfs ||
- find { get_interface_type($intf->{$_}) eq 'ethernet' && $intf->{$_}{BOOTPROTO} eq 'dhcp' } @intfs;
+ (find { get_interface_type($intf->{$_}) eq 'adsl' } @intfs) ||
+ (find { get_interface_type($intf->{$_}) eq 'isdn' && text2bool($intf->{$_}{DIAL_ON_IFUP}) } @intfs) ||
+ (find { get_interface_type($intf->{$_}) eq 'modem' } @intfs) ||
+ (find { get_interface_type($intf->{$_}) eq 'ethernet' && $intf->{$_}{BOOTPROTO} eq 'dhcp' } @intfs);
}
#- returns (gateway_interface, interface is up, gateway address, dns server address)