diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-28 09:12:16 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-28 09:12:16 +0000 |
commit | f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180 (patch) | |
tree | c6a37cc1eadd4c1af23c7cda7924d1b42f500344 /perl-install/fs/get.pm | |
parent | 48dc83bc2acf770ec4be3e4be5f74a9d49120f65 (diff) | |
download | drakx-f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180.tar drakx-f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180.tar.gz drakx-f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180.tar.bz2 drakx-f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180.tar.xz drakx-f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180.zip |
try to cleanup fs.pm
(to have simpler dependencies between modules, esp. have some modules only required by diskdrake):
- move some functions from fs to fs::mount
(most keep their name, except mount_part and mount_usbfs)
- move formatMount_part and formatMount_all from fs to fs::format
- move some functions from fs to fs::wild_device
(part2wild_device_name -> fs::wild_device::from_part)
(subpart_from_wild_device_name -> fs::wild_device::to_subpart)
(analyze_wild_device_name -> fs::wild_device::analyse)
- formatMount_part(), formatMount_all(), fs::mount::part() don't take a prefix anymore
the current situation was quite muddy
we now rely on fs::get::mntpoint_prefixed() which will maybe depend on a field in $part
for now, we mount every part in chroot, it seems to be what's wanted
- fs::format::part() now expect $all_hds instead of $raids
- fs::type::carryRootLoopback is now fs::get::carry_root_loopback()
- in fs::loopback, most functions don't want a prefix anymore
Diffstat (limited to 'perl-install/fs/get.pm')
-rw-r--r-- | perl-install/fs/get.pm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/fs/get.pm b/perl-install/fs/get.pm index 5ea9071a8..1db2d3002 100644 --- a/perl-install/fs/get.pm +++ b/perl-install/fs/get.pm @@ -6,6 +6,7 @@ use strict; use partition_table; use fs::type; use fs::loopback; +use fs::wild_device; use fs; use common; use log; @@ -70,7 +71,7 @@ sub hds_fstab_and_holes { sub device2part { my ($dev, $fstab) = @_; - my $subpart = fs::subpart_from_wild_device_name($dev); + my $subpart = fs::wild_device::to_subpart($dev); my $part = find { is_same_hd($subpart, $_) } @$fstab; log::l("fs::get::device2part: unknown device <<$dev>>") if !$part; $part; @@ -88,7 +89,7 @@ sub file2part { $file = $b_keep_simple_symlinks ? common::expand_symlinks_but_simple("$::prefix$file") : expand_symlinks("$::prefix$file"); unless ($file =~ s/^$::prefix//) { - my $part = find { fs::loopback::carryRootLoopback($_) } @$fstab or die; + my $part = find { fs::type::carry_root_loopback($_) } @$fstab or die; log::l("found $part->{mntpoint}"); $file =~ s|/initrd/loopfs|$part->{mntpoint}|; } @@ -140,4 +141,9 @@ sub is_same_hd { } } +sub mntpoint_prefixed { + my ($part) = @_; + $::prefix . $part->{mntpoint}; +} + 1; |