diff options
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 } |