diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-27 10:31:34 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-27 10:31:34 +0000 |
commit | 0306ad0100b9d40606d723706f909438a27dfac1 (patch) | |
tree | 232eab774506632a3796a5a36cf09771aa614e64 /perl-install/any.pm | |
parent | 54a662b712a584c66a9f5762d264cce50acbb6ab (diff) | |
download | drakx-0306ad0100b9d40606d723706f909438a27dfac1.tar drakx-0306ad0100b9d40606d723706f909438a27dfac1.tar.gz drakx-0306ad0100b9d40606d723706f909438a27dfac1.tar.bz2 drakx-0306ad0100b9d40606d723706f909438a27dfac1.tar.xz drakx-0306ad0100b9d40606d723706f909438a27dfac1.zip |
- add field {fs_type} partially replacing {pt_type}
{pt_type} is always a number, {fs_type} is always a string
- introduce set_isFormatted()
(to ensure {notFormatted} but also {fs_type_from_magic} and {bad_fs_type_magic} are updated)
- don't use 0x483 for ext3 anymore (same for reiserfs...),
the type_name gives both a pt_type and a fs_type
- many accessors from partition_table removed (type2fs(), fs2pt_type())
- remove isThisFs() (not useful anymore since we can use directly {fs_type})
- remove isFat() (inline the function)
- other isXXX() from partition_table are moved to fs::type
- part2name() is now fs::type::part2type_name
- name2pt_type() is now fs::type::type_name2subpart()
- partition_table::important_types() is now fs::type::type_names()
- fsedit::typeOfPart() is now fs::type::fs_type_from_magic()
- no need to truncate type_name since they are shorter
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r-- | perl-install/any.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index fa335a9af..d6ce4ee2f 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -8,7 +8,8 @@ use strict; #-###################################################################################### use common; use detect_devices; -use partition_table qw(:types); +use partition_table; +use fs::type; use fsedit; use fs; use lang; @@ -265,7 +266,7 @@ sub setupBootloader__general { if ($prev_clean_tmp != $clean_tmp) { if ($clean_tmp && !fsedit::has_mntpoint('/tmp', $all_hds)) { - push @{$all_hds->{special}}, { device => 'none', mntpoint => '/tmp', pt_type => 'tmpfs' }; + push @{$all_hds->{special}}, { device => 'none', mntpoint => '/tmp', fs_type => 'tmpfs' }; } else { @{$all_hds->{special}} = grep { $_->{mntpoint} ne '/tmp' } @{$all_hds->{special}}; } @@ -481,7 +482,7 @@ sub inspect { $dir = ''; } else { mkdir $dir, 0700; - eval { fs::mount($part->{device}, $dir, type2fs($part, 'skip'), !$b_rw) }; + eval { fs::mount($part->{device}, $dir, $part->{fs_type}, !$b_rw) }; $@ and return; } my $h = before_leaving { |