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

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d0167b40e..4acb70a9e 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -177,11 +177,11 @@ sub selectInstallClass {
 sub doPartitionDisksBefore {
     my ($o) = @_;
     eval { 
-	eval { fs::umount("$o->{prefix}/sys") };
-	eval { fs::umount("$o->{prefix}/proc/bus/usb") };
-	eval { fs::umount("$o->{prefix}/proc") };
-	eval {          fs::umount_all($o->{fstab}, $o->{prefix}) };
-	eval { sleep 1; fs::umount_all($o->{fstab}, $o->{prefix}) } if $@; #- HACK
+	eval { fs::mount::umount("$::prefix/sys") };
+	eval { fs::mount::umount("$::prefix/proc/bus/usb") };
+	eval { fs::mount::umount("$::prefix/proc") };
+	eval {          fs::mount::umount_all($o->{fstab}) };
+	eval { sleep 1; fs::mount::umount_all($o->{fstab}) } if $@; #- HACK
     } if $o->{fstab} && !$::testing;
 }
 
@@ -220,8 +220,8 @@ sub doPartitionDisksAfter {
 
     if ($o->{partitioning}{use_existing_root}) {
 	#- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat
-	fs::mount_part($_, $o->{prefix}) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} }
-						 grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}};
+	fs::mount::part($_) foreach sort { $a->{mntpoint} cmp $b->{mntpoint} }
+				    grep { $_->{mntpoint} && maybeFormatted($_) } @{$o->{fstab}};
     }
 
     cat_("/proc/mounts") =~ m|(\S+)\s+/tmp/nfsimage| &&
@@ -290,7 +290,7 @@ sub choosePartitionsToFormat($$) {
 
 sub formatMountPartitions {
     my ($o) = @_;
-    fs::formatMount_all($o->{all_hds}{raids}, $o->{fstab}, $o->{prefix}, undef);
+    fs::format::formatMount_all($o->{all_hds}, $o->{fstab}, undef);
 }
 
 #------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ sub updatemodules {
 
     my $mount_dir = '/updatemodules';
     find {
-	eval { fs::mount($dev, $mount_dir, $_, 0); 1 };
+	eval { fs::mount::mount($dev, $mount_dir, $_, 0); 1 };
     } 'ext2', 'vfat' or log::l("updatemodules: can't mount $dev"), return;
 
     my $dir = "$mount_dir$rel_dir";
@@ -623,7 +623,7 @@ sub updatemodules {
 	}
     }
 
-    fs::umount($mount_dir);
+    fs::mount::umount($mount_dir);
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1