Nuke the use of /etc/iftab (it's no longer useful) mga#11592

2 files changed, 2 insertions, 18 deletions

diff --git a/NEWS b/NEWS
index 0cf9ccc..c42d539 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- nuke the use of /etc/iftab (it's no longer useful) mga#11592
+
 2.7
 - adapt to new /etc/sysctl.d
 - drakfirewall: add 6881:6999 UDP port range for Bittorrent
diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm
index a4023a1..9b5a9d4 100644
--- a/lib/network/connection/ethernet.pm
+++ b/lib/network/connection/ethernet.pm
@@ -491,23 +491,6 @@ sub get_eth_card_mac_address {
     `$::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
-sub update_iftab() {
-    #- skip aliases and vlan interfaces
-    foreach my $intf (grep { network::tools::is_real_interface($_) } detect_devices::get_lan_interfaces()) {
-        my ($link_type, $mac_address) = get_eth_card_mac_address($intf) or next;
-        #- do not write zeroed MAC addresses in iftab, it confuses ifrename
-        $mac_address =~ /^[0:]+$/ and next;
-        # ifrename supports alsa IEEE1394, EUI64 and IRDA
-        member($link_type, 'ether', 'ieee1394', 'irda', '[27]') or next;
-        substInFile {
-            s/^$intf\s+.*\n//;
-            s/^.*\s+$mac_address\n//;
-            $_ .= qq($intf mac $mac_address\n) if eof;
-        } "$::prefix/etc/iftab";
-    }
-}
-
 sub update_udev_net_config() {
     my $net_name_helper = "/lib/udev/write_net_rules";
     my $udev_net_config = "$::prefix/etc/udev/rules.d/70-persistent-net.rules";
@@ -535,7 +518,6 @@ sub configure_eth_aliases {
         $modules_conf->set_alias($card->[0], $card->[1]);
     }
     $::isStandalone and $modules_conf->write;
-    update_iftab();
     update_udev_net_config();
 }