diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-10-07 09:48:03 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-10-07 09:48:03 +0000 |
| commit | dd962c22f7e02d9bbcc7f62c515d4c2ab7b1fdf3 (patch) | |
| tree | 637e40c85752c76c9af8d63c61e0eb3e1fbe235f /perl-install/fs | |
| parent | 4b06a8a57d52b7d5447a1b487b8d33e36b4121b7 (diff) | |
| download | drakx-dd962c22f7e02d9bbcc7f62c515d4c2ab7b1fdf3.tar drakx-dd962c22f7e02d9bbcc7f62c515d4c2ab7b1fdf3.tar.gz drakx-dd962c22f7e02d9bbcc7f62c515d4c2ab7b1fdf3.tar.bz2 drakx-dd962c22f7e02d9bbcc7f62c515d4c2ab7b1fdf3.tar.xz drakx-dd962c22f7e02d9bbcc7f62c515d4c2ab7b1fdf3.zip | |
- factorize default FS definition
- switch to ext4 by default
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/dmcrypt.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm index d79464c35..e817edd23 100644 --- a/perl-install/fs/dmcrypt.pm +++ b/perl-install/fs/dmcrypt.pm @@ -124,7 +124,7 @@ sub _get_existing_one { } fs::type::set_isFormatted($part, to_bool($part->{fs_type})); - $part->{fs_type} or fs::type::set_fs_type($part, 'ext3'); + $part->{fs_type} or fs::type::set_fs_type($part, defaultFS()); log::l("dmcrypt: found $part->{device} type $part->{fs_type} with rootDevice $part->{rootDevice}"); diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 244c7126d..80176f15a 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -10,7 +10,7 @@ use devices; our @ISA = qw(Exporter); our @EXPORT = qw( isEmpty isExtended isTrueLocalFS isTrueFS isDos isSwap isOtherAvailableFS isRawLVM isRawRAID isRAID isLVM isMountableRW isNonMountable isPartOfLVM isPartOfRAID isPartOfLoopback isLoopback isMounted isBusy isSpecial isApple isAppleBootstrap isWholedisk isFat_or_NTFS isRecovery - maybeFormatted set_isFormatted + maybeFormatted set_isFormatted defaultFS ); @@ -309,6 +309,8 @@ sub type_subpart_from_magic { $p; } +sub defaultFS { 'ext4' } + sub true_local_fs_types() { qw(ext3 ext2 ext4 reiserfs reiser4 xfs jfs) } sub isEmpty { !$_[0]{fs_type} && $_[0]{pt_type} == 0 } |