diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-28 09:12:16 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-28 09:12:16 +0000 |
commit | f1323d79cc7dd3aa5f4ebde2e2744d7a7ad56180 (patch) | |
tree | c6a37cc1eadd4c1af23c7cda7924d1b42f500344 /perl-install/standalone | |
parent | 48dc83bc2acf770ec4be3e4be5f74a9d49120f65 (diff) | |
download | drakx-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/standalone')
-rwxr-xr-x | perl-install/standalone/bootloader-config | 2 | ||||
-rwxr-xr-x | perl-install/standalone/drakautoinst | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config index e167a5e54..5903b0226 100755 --- a/perl-install/standalone/bootloader-config +++ b/perl-install/standalone/bootloader-config @@ -120,7 +120,7 @@ sub add_kernel() { my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "can not find root partition\n"; my %opts = ( - root => fs::part2wild_device_name('', $root_part), + root => fs::wild_device::from_part('', $root_part), initrd_options => $initrd_options, if_($label, label => $label), if_($bootloader->{default_vga}, vga => $bootloader->{default_vga}), diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index 6dbfb3a36..b4b1e3453 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -82,11 +82,11 @@ do { }; $again = $@; #- grrr... $@ is localized in code block :-( } while $again; -fs::mount($dev, $mountdir, 'vfat', 0); +fs::mount::mount($dev, $mountdir, 'vfat', 0); if (-f $imagefile2) { do { - eval { fs::umount($mountdir) }; + eval { fs::mount::umount($mountdir) }; $in->ask_okcancel('', N("Insert another blank floppy in drive %s (for drivers disk)", $floppy), 1) or quit_global($in, 0); log::explanations(N("Creating auto install floppy (drivers disk)")); my $_w = $in->wait_message('', N("Creating auto install floppy")); @@ -96,7 +96,7 @@ if (-f $imagefile2) { }; $again = $@; #- grrr... $@ is localized in code block :-( } while $again; - fs::mount($dev, $mountdir, 'ext2', 0); + fs::mount::mount($dev, $mountdir, 'ext2', 0); } my $cfgfile = "$mountdir/auto_inst.cfg"; @@ -245,7 +245,7 @@ my $str = join('', $str =~ s/ {8}/\t/g; #- replace all 8 space char by only one tabulation, this reduces file size so much :-) output($cfgfile, $str); -fs::umount($mountdir); +fs::mount::umount($mountdir); $in->ask_okcancel(N("Congratulations!"), N("The floppy has been successfully generated. |