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/diskdrake/interactive.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'perl-install/diskdrake')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index c59973220..a6349b9c5 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -573,7 +573,7 @@ First remove a primary partition and create an extended partition."));
     if ($migrate_files eq 'migrate') {
 	format_($in, $hd, $part, $all_hds) or return;
 	migrate_files($in, $hd, $part);
-	fs::mount_part($part);
+	fs::mount::part($part);
     }
 }
 
@@ -676,7 +676,7 @@ Remove the loopback first")), return 1;
     if ($migrate_files eq 'migrate') {
 	format_($in, $hd, $part, $all_hds) or return;
 	migrate_files($in, $hd, $part);
-	fs::mount_part($part);
+	fs::mount::part($part);
     }
 }
 sub Mount_point_raw_hd {
@@ -827,7 +827,7 @@ sub Mount {
     my ($in, $hd, $part) = @_;
     write_partitions($in, $hd) or return;
     my $w;
-    fs::mount_part($part, $::prefix, 0, sub {
+    fs::mount::part($part, 0, sub {
         	my ($msg) = @_;
         	$w ||= $in->wait_message('', $msg);
         	$w->set($msg);
@@ -875,7 +875,7 @@ sub Add2LVM {
 }
 sub Unmount {
     my ($_in, $_hd, $part) = @_;
-    fs::umount_part($part);
+    fs::mount::umount_part($part);
 }
 sub RemoveFromRAID { 
     my ($_in, $_hd, $part, $all_hds) = @_;
@@ -1110,7 +1110,7 @@ sub format_ {
     }
     $part->{isFormatted} = 0; #- force format;
     my ($_w, $wait_message) = fs::format::wait_message($in);
-    fs::format::part($all_hds->{raids}, $part, $::prefix, $wait_message);
+    fs::format::part($all_hds, $part, $wait_message);
     1;
 }
 
-- 
cgit v1.2.1