From f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux 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/network/thirdparty.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/network') diff --git a/perl-install/network/thirdparty.pm b/perl-install/network/thirdparty.pm index 8950832e6..2110fc5f2 100644 --- a/perl-install/network/thirdparty.pm +++ b/perl-install/network/thirdparty.pm @@ -321,9 +321,9 @@ sub find_file_on_floppy { my $h; $in->ask_okcancel(N("Insert floppy"), N("Insert a FAT formatted floppy in drive %s with %s in root directory and press %s", $floppy, $file, N("Next"))) or return; - if (eval { fs::mount(devices::make($floppy), $mountpoint, 'vfat', 'readonly'); 1 }) { + if (eval { fs::mount::mount(devices::make($floppy), $mountpoint, 'vfat', 'readonly'); 1 }) { log::explanations("Mounting floppy device $floppy in $mountpoint"); - $h = before_leaving { fs::umount($mountpoint) }; + $h = before_leaving { fs::mount::umount($mountpoint) }; if ($h->{file} = first(glob("$mountpoint/$file"))) { log::explanations("Found $h->{file} on floppy device"); } else { -- cgit v1.2.1