diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-02 13:26:31 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-02 13:26:31 +0000 |
| commit | b178c8ecfb5232f455b3d986c735f53e24079672 (patch) | |
| tree | 039417231739e97375503f81e5961e6bce612ef6 | |
| parent | 08393f98d1e047a52d57c4e23568148ea9807184 (diff) | |
| download | drakx-backup-do-not-use-b178c8ecfb5232f455b3d986c735f53e24079672.tar drakx-backup-do-not-use-b178c8ecfb5232f455b3d986c735f53e24079672.tar.gz drakx-backup-do-not-use-b178c8ecfb5232f455b3d986c735f53e24079672.tar.bz2 drakx-backup-do-not-use-b178c8ecfb5232f455b3d986c735f53e24079672.tar.xz drakx-backup-do-not-use-b178c8ecfb5232f455b3d986c735f53e24079672.zip | |
remove pseudo global variables use from use_floppy()
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/tools.pm | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index c4de05e26..e81b0d89c 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -609,7 +609,7 @@ or skip and do it later."), if ($adsl_answer eq N("Use a floppy")) { $mounted = 1; $file = 'mgmt.o'; - ($source, $adsl_failed) = network::tools::use_floppy($file); + ($source, $adsl_failed) = network::tools::use_floppy($in, $file); } elsif ($adsl_answer eq N("Use my Windows partition")) { $file = 'alcaudsl.sys'; ($source, $adsl_failed) = network::tools::use_windows(); diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 661cf79bc..d32fb5b13 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -5,12 +5,10 @@ use common; use run_program; use c; use vars qw(@ISA @EXPORT @EXPORT_OK); -use MDK::Common::Globals "network", qw($in); use MDK::Common::System qw(getVarsFromSh); @ISA = qw(Exporter); @EXPORT = qw(connect_backend connected connected_bg disconnect_backend is_dynamic_ip is_wireless_intf passwd_by_login read_providers_backend read_secret_backend set_cnx_script test_connected write_cnx_script write_initscript write_secret_backend); -@EXPORT_OK = qw($in); our $connect_prog = "/etc/sysconfig/network-scripts/net_cnx_pg"; my $connect_file = "/etc/sysconfig/network-scripts/net_cnx_up"; @@ -204,7 +202,7 @@ sub use_windows() { } sub use_floppy { - my ($file) = @_; + my ($in, $file) = @_; my $floppy = detect_devices::floppy(); $in->ask_okcancel(N("Insert floppy"), N("Insert a FAT formatted floppy in drive %s with %s in root directory and press %s", $floppy, $file, N("Next"))) or return; |