summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-08-03 05:41:59 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-08-03 05:41:59 +0000
commitf8d30c05a05c1c01b3f8a758c54f4af07d7b114e (patch)
tree195d64c8532c126b49c0e71f649d08fbfe8f330b /perl-install/network
parent607de8e2fa2b83e8b9cefd4ced24d3b4e24fc007 (diff)
downloaddrakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar
drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.gz
drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.bz2
drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.xz
drakx-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.zip
many functions in fsedit don't modify anything, they are simply accessors.
create fs::get and move them into it - device2part(), up_mount_point() moved from fs to fs::get - part2hd(), file2part(), has_mntpoint(), mntpoint2part(), empty_all_hds() moved from fsedit to fs::get - fsedit::get_root() -> fs::get::root() - fsedit::get_root_() -> fs::get::root_() - fsedit::get_really_all_fstab() -> fs::get::really_all_fstab() - fsedit::get_all_fstab_and_holes() -> fs::get::fstab_and_holes() - fsedit::get_all_fstab() -> fs::get::fstab() - fsedit::get_all_holes() -> fs::get::holes() - fsedit::all_free_space -> fs::get::free_space() - fsedit::get_really_all_fstab() -> fs::get::really_all_fstab() - fsedit::get_fstab_and_holes() -> fs::get::hds_fstab_and_holes() - fsedit::get_holes() -> fs::get::hds_holes() - fsedit::get_fstab() -> fs::get::hds_fstab() - fsedit::free_space() -> fs::get::hds_free_space() - fsedit::get_visible_fstab() unused, removed
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/netconnect.pm1
-rw-r--r--perl-install/network/tools.pm3
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e08914a7e..d3aac8101 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -7,6 +7,7 @@ use detect_devices;
use run_program;
use modules;
use any;
+use fs;
use mouse;
use network::network;
use network::tools;
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 0e5439594..bdfa8a13a 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -3,6 +3,7 @@ package network::tools; # $Id$
use strict;
use common;
use run_program;
+use fsedit;
use c;
use vars qw(@ISA @EXPORT @EXPORT_OK);
use MDK::Common::System qw(getVarsFromSh);
@@ -156,7 +157,7 @@ sub use_windows {
my ($file) = @_;
my $all_hds = fsedit::get_hds({}, undef);
fs::get_info_from_fstab($all_hds, '');
- my $part = find { $_->{device_windobe} eq 'C' } fsedit::get_fstab(@{$all_hds->{hds}});
+ my $part = find { $_->{device_windobe} eq 'C' } fs::get::fstab($all_hds);
$part or my $failed = N("No partition available");
my $source = find { -d $_ && -r "$_/$file" } map { "$part->{mntpoint}/$_" } qw(windows/system winnt/system windows/system32/drivers winnt/system32/drivers);
log::explanations($failed || "Seek in $source to find firmware");