diff options
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index b2d8ed0b7..96ee9411d 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -287,7 +287,7 @@ sub preConfigureTimezone { $o->{timezone}{timezone} ||= timezone::bestTimezone(lang::lang2text($o->{lang})); - my $utc = every { !isFat($_) && !isNT($_) } @{$o->{fstab}}; + my $utc = every { !isFat_or_NTFS($_) } @{$o->{fstab}}; my $ntp = timezone::ntp_server($o->{prefix}); add2hash_($o->{timezone}, { UTC => $utc, ntp => $ntp }); } @@ -1005,7 +1005,7 @@ sub getHds { $o->{fstab} = [ fsedit::get_all_fstab($all_hds) ]; fs::merge_info_from_mtab($o->{fstab}); - my @win = grep { isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) }) } @{$o->{fstab}}; + my @win = grep { isFat_or_NTFS($_) && isFAT_or_NTFS({ type => fsedit::typeOfPart($_->{device}) }) } @{$o->{fstab}}; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; if (@win == 1) { #- Suggest /boot/efi on ia64. @@ -1017,14 +1017,6 @@ sub getHds { } } - { - my @nt = grep { isNT($_) && isNT({ type => fsedit::typeOfPart($_->{device}) }) } @{$o->{fstab}}; - log::l("nt parts: ", join ",", map { $_->{device} } @nt) if @nt; - my $i; foreach (@nt) { - $_->{mntpoint} = $_->{unsafeMntpoint} = "/mnt/nt" . ($i++ ? $i : ''); - } - } - my @sunos = grep { isSunOS($_) && type2name($_->{type}) =~ /root/i } @{$o->{fstab}}; #- take only into account root partitions. if (@sunos) { my $v = ''; |