From a1a03584ae73aece691aef507a43e1cffa668119 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 14 Sep 2004 07:35:07 +0000
Subject: (configureNetwork2) configure eth aliases, needs modules_conf

---
 perl-install/network/ethernet.pm    | 2 +-
 perl-install/network/netconnect.pm  | 4 ++--
 perl-install/network/network.pm     | 3 ++-
 perl-install/standalone/drakconnect | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 581606c16..a86bff8de 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -15,7 +15,7 @@ use vars qw(@ISA @EXPORT);
 
 sub write_ether_conf {
     my ($in, $modules_conf, $netcnx, $netc, $intf) = @_;
-    configureNetwork2($in, $::prefix, $netc, $intf);
+    configureNetwork2($in, $modules_conf, $::prefix, $netc, $intf);
     $netc->{NETWORKING} = "yes";
     if ($netc->{GATEWAY} || any { $_->{BOOTPROTO} =~ /dhcp/ } values %$intf) {
 	$netcnx->{type} = 'lan';
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 4df8a1b06..fb4953e5e 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -193,7 +193,7 @@ sub real_main {
           } else {
               undef $netc->{NET_DEVICE};
           }
-          network::network::configureNetwork2($in, $::prefix, $netc, $intf);
+          network::network::configureNetwork2($in, $modules_conf, $::prefix, $netc, $intf);
           $network_configured = 1;
           return "restart" if $need_restart_network && $::isStandalone && !$::expert;
           return $offer_to_connect->();
@@ -1311,7 +1311,7 @@ Click on Ok to keep your configuration, or cancel to reconfigure your Internet &
       }
 
     # install needed packages:
-    $network_configured or network::network::configureNetwork2($in, $::prefix, $netc, $intf);
+    $network_configured or network::network::configureNetwork2($in, $modules_conf, $::prefix, $netc, $intf);
 
     $netcnx->{$_} = $netc->{$_} foreach qw(NET_DEVICE NET_INTERFACE);
     $netcnx->{type} =~ /adsl/ or run_program::rooted($::prefix, "/chkconfig --del adsl 2> /dev/null");
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index fdb0c12b1..a578e32f0 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -421,11 +421,12 @@ sub easy_dhcp {
 #-  $intf->{$device}{DEVICE} : DEVICE = $device
 #-  $intf->{$device}{BOOTPROTO} : boot prototype : "bootp" or "dhcp" or "pump" or ...
 sub configureNetwork2 {
-    my ($in, $_prefix, $netc, $intf) = @_;
+    my ($in, $modules_conf, $_prefix, $netc, $intf) = @_;
     my $etc = "$::prefix/etc";
     if (!$::testing) {
         require network::ethernet;
         network::ethernet::update_iftab();
+        network::ethernet::configure_eth_aliases($modules_conf);
 
         $netc->{wireless_eth} and $in->do_pkgs->ensure_binary_is_installed('wireless-tools', 'iwconfig', 'auto');
         write_conf("$etc/sysconfig/network", $netc);
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 0d73366bd..0181251ea 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -751,7 +751,7 @@ sub apply {
     my $lintf = $intf;
     $dyn and $lintf->{$_} = undef foreach qw(NETMASK NETWORK IPADDR);
     network::network::sethostname($netc) if $dyn;
-    network::network::configureNetwork2($in, '', $netc, { $lintf->{DEVICE} => $lintf });
+    network::network::configureNetwork2($in, $modules_conf, '', $netc, { $lintf->{DEVICE} => $lintf });
 }
 
 sub ethisup { `LC_ALL=C LANGUAGE=C /sbin/ifconfig $_[0]` =~ /inet/ }
@@ -1027,7 +1027,7 @@ Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"));
                                                                               update();
                                                                               $button_apply->set_sensitive(1);
                                                                           } else {
-                                                                              configureNetwork2($in, '', $netc, $intf);
+                                                                              configureNetwork2($in, $modules_conf, '', $netc, $intf);
                                                                               write_resolv_conf("/etc/resolv.conf", $netc);
                                                                           }
                                                                           $exit_dialogsub->();
-- 
cgit v1.2.1