From f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 28 Jun 2005 09:12:16 +0000
Subject: 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
---
 perl-install/fs/get.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'perl-install/fs/get.pm')

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;
-- 
cgit v1.2.1