summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-07-18 06:06:17 +0000
committerOlivier Blin <oblin@mandriva.org>2005-07-18 06:06:17 +0000
commit6ecdb508c096697c0a74a92b1a4aab89101c86d5 (patch)
tree4847be40b426aa560d7ecf34b1bd0550bdc96b78
parentafc256ef2028e6dc2d700ff6ba158efc1702d2d4 (diff)
downloaddrakx-6ecdb508c096697c0a74a92b1a4aab89101c86d5.tar
drakx-6ecdb508c096697c0a74a92b1a4aab89101c86d5.tar.gz
drakx-6ecdb508c096697c0a74a92b1a4aab89101c86d5.tar.bz2
drakx-6ecdb508c096697c0a74a92b1a4aab89101c86d5.tar.xz
drakx-6ecdb508c096697c0a74a92b1a4aab89101c86d5.zip
get_eth_card_mac_address: handle firewire mac_addresses again
-rw-r--r--perl-install/network/ethernet.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 5fb8e0a1d..6363c415b 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -107,7 +107,8 @@ sub get_eth_cards_names {
#- returns (link_type, mac_address)
sub get_eth_card_mac_address {
my ($intf) = @_;
- `LC_ALL= LANG= $::prefix/sbin/ip -o link show $intf 2>/dev/null` =~ m|.*link/(\S+)\s((?:[0-9a-f]{2}:){5}[0-9a-f]{2})\s|;
+ #- don't look for 6 bytes addresses only because of firewire
+ `LC_ALL= LANG= $::prefix/sbin/ip -o link show $intf 2>/dev/null` =~ m|.*link/(\S+)\s((?:[0-9a-f]{2}:?)+)\s|;
}
#- write interfaces MAC address in iftab