From cafadbb6ee35e3a03f7a1707b5c309b83fea728b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 4 Aug 2005 10:20:33 +0000
Subject: use ifup/ifdown with the boot option to handle ifplugd

---
 perl-install/network/netconnect.pm |  8 +-------
 perl-install/network/tools.pm      | 14 +-------------
 2 files changed, 2 insertions(+), 20 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 1cf2786fc..c45c77f93 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -158,18 +158,12 @@ sub real_main {
                                );
 
       my $offer_to_connect = sub {
-	  network::tools::stop_ifplugd($net->{net_interface});
-
 	  if ($net->{type} eq 'adsl' && !member($net->{adsl}{method}, qw(static dhcp)) ||
 	      member($net->{type}, qw(modem isdn isdn_external))) {
 	      return "ask_connect_now";
 	  } else {
 	      network::tools::stop_net_interface($net, 0);
-	      if ($ethntf->{MII_NOT_SUPPORTED} eq "yes" || $::isInstall) {
-		  network::tools::start_net_interface($net, 0);
-	      } else {
-		  network::tools::start_ifplugd($net->{net_interface});
-	      }
+	      network::tools::start_net_interface($net, 0);
 	  }
           return "end";
       };
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index f4a22a5e1..0c88cf055 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -60,7 +60,7 @@ sub run_interface_command {
     my ($command, $intf, $detach) = @_;
     my @command =
       !$> || system("/usr/sbin/usernetctl $intf report") == 0 ?
-	($command, $intf) :
+	($command, $intf, if_(!$::isInstall, "boot")) :
 	wrap_command_for_root($command, $intf);
     run_program::raw({ detach => $detach, root => $::prefix }, @command);
 }
@@ -85,18 +85,6 @@ sub stop_net_interface {
     stop_interface($net->{net_interface}, $detach);
 }
 
-sub start_ifplugd {
-    my ($interface) = @_;
-    run_program::run('/sbin/ifplugd', '-b', '-i', $interface);
-}
-
-sub stop_ifplugd {
-    my ($interface) = @_;
-    my $ifplugd = chomp_(cat_("/var/run/ifplugd.$interface.pid"));
-    $ifplugd and kill(15, $ifplugd);
-    sleep 1;
-}
-
 sub connected() { gethostbyname("www.mandriva.com") ? 1 : 0 }
 
 # request a ref on a bg_connect and a ref on a scalar
-- 
cgit v1.2.1