summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
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/install_any.pm
parent607de8e2fa2b83e8b9cefd4ced24d3b4e24fc007 (diff)
downloaddrakx-backup-do-not-use-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar
drakx-backup-do-not-use-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.gz
drakx-backup-do-not-use-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.bz2
drakx-backup-do-not-use-f8d30c05a05c1c01b3f8a758c54f4af07d7b114e.tar.xz
drakx-backup-do-not-use-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/install_any.pm')
-rw-r--r--perl-install/install_any.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 5c30dcf40..661de041d 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -25,7 +25,6 @@ use detect_devices;
use lang;
use any;
use log;
-use fs;
#- boot medium (the first medium to take into account).
$boot_medium = 1;
@@ -476,7 +475,7 @@ sub setDefaultPackages {
push @{$o->{default_packages}}, "raidtools" if !is_empty_array_ref($o->{all_hds}{raids});
push @{$o->{default_packages}}, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms});
push @{$o->{default_packages}}, "alsa", "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4;
- push @{$o->{default_packages}}, "grub" if isLoopback(fsedit::get_root($o->{fstab}));
+ push @{$o->{default_packages}}, "grub" if isLoopback(fs::get::root($o->{fstab}));
push @{$o->{default_packages}}, uniq(grep { $_ } map { fs::format::package_needed_for_partition_type($_) } @{$o->{fstab}});
#- if no cleaning needed, populate by default, clean is used for second or more call to this function.
@@ -1067,7 +1066,7 @@ sub suggest_mount_points {
my ($mnt, $handle) = guess_mount_point($part, $prefix, \$user) or next;
- next if $uniq && fsedit::mntpoint2part($mnt, $fstab);
+ next if $uniq && fs::get::mntpoint2part($mnt, $fstab);
$part->{mntpoint} = $mnt; delete $part->{unsafeMntpoint};
#- try to find other mount points via fstab
@@ -1096,7 +1095,7 @@ sub use_root_part {
my $handle = any::inspect($part, $prefix) or die;
fs::get_info_from_fstab($all_hds, $handle->{dir});
}
- isSwap($_) and $_->{mntpoint} = 'swap' foreach fsedit::get_really_all_fstab($all_hds); #- use all available swap.
+ isSwap($_) and $_->{mntpoint} = 'swap' foreach fs::get::really_all_fstab($all_hds); #- use all available swap.
}
sub getHds {
@@ -1117,7 +1116,7 @@ sub getHds {
fs::add2all_hds($all_hds, @{$o->{manualFstab}});
$o->{all_hds} = $all_hds;
- $o->{fstab} = [ fsedit::get_really_all_fstab($all_hds) ];
+ $o->{fstab} = [ fs::get::really_all_fstab($all_hds) ];
fs::merge_info_from_mtab($o->{fstab});
my @win = grep { isFat_or_NTFS($_) && maybeFormatted($_) && !$_->{is_removable} } @{$o->{fstab}};