From 3b18e08492ede4590189018057c4d74c9eb511cb Mon Sep 17 00:00:00 2001 From: damien Date: Mon, 27 Aug 2001 16:54:16 +0000 Subject: corrected hwaddr stuff --- perl-install/network/network.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/network') diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 98c3e285b..51ade899c 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -117,8 +117,8 @@ sub write_interface_conf { my @ip = split '\.', $intf->{IPADDR}; my @mask = split '\.', $intf->{NETMASK}; - my $hwaddr = -e $prefix/sbin/ip ? `LC_ALL= LANG= $prefix/sbin/ip -o link show $intf` : undef; - if ($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/; } + my $hwaddr = -e $prefix/sbin/ip && `LC_ALL= LANG= $prefix/sbin/ip -o link show $intf->{DEVICE}`; + if($hwaddr) { chomp $hwaddr; $hwaddr =~ s/.*link\/ether\s([0-9a-z:]+)\s.*/$1/; } add2hash($intf, { BROADCAST => join('.', mapn { int $_[0] | ~int $_[1] & 255 } \@ip, \@mask), NETWORK => join('.', mapn { int $_[0] & $_[1] } \@ip, \@mask), -- cgit v1.2.1