summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.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/install2.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/install2.pm')
-rw-r--r--perl-install/install2.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 823d03386..1fab5e8f3 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -187,9 +187,9 @@ sub formatPartitions {
devices::make("$o->{prefix}/dev/null");
chmod 0666, "$o->{prefix}/dev/null";
- eval { fs::mount('none', "$o->{prefix}/proc", 'proc') };
- eval { fs::mount('none', "$o->{prefix}/sys", 'sysfs') };
- eval { fs::mount_usbfs($o->{prefix}) };
+ eval { fs::mount::mount('none', "$::prefix/proc", 'proc') };
+ eval { fs::mount::mount('none', "$::prefix/sys", 'sysfs') };
+ eval { fs::mount::usbfs($::prefix) };
install_any::screenshot_dir__and_move();
install_any::move_clp_to_disk();
@@ -422,7 +422,7 @@ sub main {
log::l("second stage install running (", install_any::drakx_version(), ")");
eval { output('/proc/sys/kernel/modprobe', "\n") } if !$::local_install && !$::testing; #- disable kmod, otherwise we get a different behaviour in kernel vs kernel-BOOT
- eval { fs::mount('none', '/sys', 'sysfs', 1) };
+ eval { fs::mount::mount('none', '/sys', 'sysfs', 1) };
if ($::move) {
require move;
@@ -432,13 +432,13 @@ sub main {
push @auto,
# 'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
'doPartitionDisks', 'formatPartitions', 'setupBootloader';
- fs::mount_usbfs(''); #- do it now so that when_load doesn't do it
+ fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
}
cp_f(glob('/stage1/tmp/*'), '/tmp');
#- free up stage1 memory
- eval { fs::umount($_) } foreach qw(/stage1/proc/bus/usb /stage1/proc /stage1);
+ eval { fs::mount::umount($_) } foreach qw(/stage1/proc/bus/usb /stage1/proc /stage1);
$o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : $::move ? "" : "/mnt";
mkdir $o->{prefix}, 0755;