diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-01-05 19:56:50 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-01-05 20:00:31 +0000 |
| commit | 21c4a89f2b05625e362d7ff78a7fb2b1d4a9302a (patch) | |
| tree | e3051db9a673646618bf15dea1511ec585c6d53e | |
| parent | 8859bff312e8b6064b6f1a20f8c5a647bf5e5d2b (diff) | |
| download | drakx-net-21c4a89f2b05625e362d7ff78a7fb2b1d4a9302a.tar drakx-net-21c4a89f2b05625e362d7ff78a7fb2b1d4a9302a.tar.gz drakx-net-21c4a89f2b05625e362d7ff78a7fb2b1d4a9302a.tar.bz2 drakx-net-21c4a89f2b05625e362d7ff78a7fb2b1d4a9302a.tar.xz drakx-net-21c4a89f2b05625e362d7ff78a7fb2b1d4a9302a.zip | |
Nuke an ethN regexp that prevents network coming up in installer mga#11592
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/network/network.pm | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -1,6 +1,7 @@ - nuke the use of /etc/iftab (it's no longer useful) mga#11592 - nuke the use of udev rules for network device names (persistent device names make it no longer relevant) mga#11592 +- nuke an ethN regexp that prevents network coming up in installer mga#11592 2.7 - adapt to new /etc/sysctl.d diff --git a/lib/network/network.pm b/lib/network/network.pm index e039821..6b78b4c 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -783,7 +783,7 @@ sub easy_dhcp { modules::load_category($modules_conf, list_modules::ethernet_categories()); my @all_dev = sort map { $_->[0] } network::connection::ethernet::get_eth_cards($modules_conf); - my @ether_dev = grep { /^eth[0-9]+$/ && `LC_ALL= LANG= $::prefix/sbin/ip -o link show $_ 2>/dev/null` =~ m|\slink/ether\s| } @all_dev; + my @ether_dev = grep { `LC_ALL= LANG= $::prefix/sbin/ip -o link show $_ 2>/dev/null` =~ m|\slink/ether\s| } @all_dev; foreach my $dhcp_intf (@ether_dev) { log::explanations("easy_dhcp: found $dhcp_intf"); $net->{ifcfg}{$dhcp_intf} ||= {}; |