summaryrefslogtreecommitdiffstats
path: root/perl-install/commands.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-28 09:12:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-28 09:12:16 +0000
commitf1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180 (patch)
treec6a37cc1eadd4c1af23c7cda7924d1b42f500344 /perl-install/commands.pm
parent48dc83bc2acf770ec4be3e4be5f74a9d49120f65 (diff)
downloaddrakx-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/commands.pm')
-rw-r--r--perl-install/commands.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index b15b0a596..ff27efa79 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -63,8 +63,8 @@ sub tr_ {
sub umount {
@_ == 1 or die "umount expects a single argument\n";
- require fs;
- fs::umount($_[0]);
+ require fs::mount;
+ fs::mount::umount($_[0]);
}
sub mkdir_ {
@@ -139,13 +139,13 @@ sub chown_ {
sub swapon {
@_ == 1 or die "swapon <file>\n";
- require fs;
- fs::swapon($_[0]);
+ require fs::mount;
+ fs::mount::swapon($_[0]);
}
sub swapoff {
@_ == 1 or die "swapoff <file>\n";
- require fs;
- fs::swapoff($_[0]);
+ require fs::mount;
+ fs::mount::swapoff($_[0]);
}
sub rights {
@@ -437,7 +437,7 @@ sub bug {
require modules;
require fs;
modules::load_dependencies("/modules/modules.dep");
- fs::mount(devices::make(detect_devices::floppy()), '/fd0', 'vfat');
+ fs::mount::mount(devices::make(detect_devices::floppy()), '/fd0', 'vfat');
require install_any;
output("/fd0/report.bug", install_any::report_bug());