From a655b0e1e07efb3fd057f726b85887908d970ba6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 10 Jun 2005 07:38:18 +0000
Subject: - move functions using /proc/partitions out of fsedit to
 fs::proc_partitions - remove unneeded "use xxx" - add some "use xxx" (nb: not
 completly needed because some other modules may do it)

---
 perl-install/network/adsl.pm     | 1 -
 perl-install/network/dhcpd.pm    | 1 -
 perl-install/network/ethernet.pm | 4 ----
 perl-install/network/ipsec.pm    | 2 --
 perl-install/network/isdn.pm     | 1 -
 perl-install/network/modem.pm    | 2 +-
 perl-install/network/network.pm  | 1 -
 perl-install/network/nfs.pm      | 1 -
 perl-install/network/smb.pm      | 2 +-
 perl-install/network/smbnfs.pm   | 2 +-
 10 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 9da5a3f7c..ca0b0e272 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -3,7 +3,6 @@ package network::adsl; # $Id$
 use common;
 use run_program;
 use network::tools;
-use network::ethernet;
 use modules;
 use vars qw(@ISA @EXPORT);
 
diff --git a/perl-install/network/dhcpd.pm b/perl-install/network/dhcpd.pm
index d91df441f..8cf30d5fc 100644
--- a/perl-install/network/dhcpd.pm
+++ b/perl-install/network/dhcpd.pm
@@ -2,7 +2,6 @@ package network::dhcpd;
 
 use strict;
 use common;
-use network::network;
 
 my $sysconf_dhcpd = "$::prefix/etc/sysconfig/dhcpd";
 my $dhcpd_conf_file = "$::prefix/etc/dhcpd.conf";
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index dcda7b643..29e2b5d10 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -1,13 +1,9 @@
 package network::ethernet; # $Id$
 
 use c;
-use network::network;
-use modules;
-use modules::interactive;
 use detect_devices;
 use common;
 use run_program;
-use network::tools;
 
 our @dhcp_clients = qw(dhclient dhcpcd pump dhcpxd);
 
diff --git a/perl-install/network/ipsec.pm b/perl-install/network/ipsec.pm
index c0ee6e2fb..b40e6c79b 100644
--- a/perl-install/network/ipsec.pm
+++ b/perl-install/network/ipsec.pm
@@ -3,11 +3,9 @@ package network::ipsec;
 
 
 use detect_devices;
-use network::netconnect;
 use run_program;
 use common;
 use log;
-use Data::Dumper;
 
 #- debugg functions ----------
 sub recreate_ipsec_conf {
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 11068828b..35c287d2c 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -3,7 +3,6 @@ package network::isdn; # $Id$
 use strict;
 use network::isdn_consts;
 use common;
-use any;
 use modules;
 use run_program;
 use log;
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index f600db844..8c5adf523 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -5,7 +5,7 @@ use common;
 use any;
 use modules;
 use detect_devices;
-use mouse;
+use network::network;
 use network::tools;
 
 sub get_user_home() {
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 9eca1b4b4..c702d7a61 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -11,7 +11,6 @@ use common;
 use detect_devices;
 use run_program;
 use network::tools;
-use any;
 use vars qw(@ISA @EXPORT);
 use log;
 
diff --git a/perl-install/network/nfs.pm b/perl-install/network/nfs.pm
index 37dd954e5..194a9c678 100644
--- a/perl-install/network/nfs.pm
+++ b/perl-install/network/nfs.pm
@@ -4,7 +4,6 @@ use strict;
 use diagnostics;
 
 use common;
-use network::network;
 use network::smbnfs;
 use log;
 
diff --git a/perl-install/network/smb.pm b/perl-install/network/smb.pm
index ef98f6945..7fca6d65c 100644
--- a/perl-install/network/smb.pm
+++ b/perl-install/network/smb.pm
@@ -4,7 +4,7 @@ use strict;
 use diagnostics;
 
 use common;
-use fs;
+use fs::mount_options;
 use network::network;
 use network::smbnfs;
 
diff --git a/perl-install/network/smbnfs.pm b/perl-install/network/smbnfs.pm
index c38903028..bc5b92b60 100644
--- a/perl-install/network/smbnfs.pm
+++ b/perl-install/network/smbnfs.pm
@@ -3,7 +3,7 @@ package network::smbnfs; # $Id$
 use strict;
 use diagnostics;
 
-use fs;
+use fs::mount_options;
 
 
 sub new { 
-- 
cgit v1.2.1