From 6ecdb508c096697c0a74a92b1a4aab89101c86d5 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Mon, 18 Jul 2005 06:06:17 +0000
Subject: get_eth_card_mac_address: handle firewire mac_addresses again

---
 perl-install/network/ethernet.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/network')

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
-- 
cgit v1.2.1