diff options
| author | Erwan Velu <erwan@mandriva.org> | 2003-02-26 11:41:12 +0000 |
|---|---|---|
| committer | Erwan Velu <erwan@mandriva.org> | 2003-02-26 11:41:12 +0000 |
| commit | 7c74b82ced598699133943b28b2e0cd1ad46c2cf (patch) | |
| tree | 57b8d5b666824342634bab9a0f16465efbe39ba0 | |
| parent | 2ea9e3da50c3c04bd9e466f86c9098785af3cb4b (diff) | |
| download | drakx-7c74b82ced598699133943b28b2e0cd1ad46c2cf.tar drakx-7c74b82ced598699133943b28b2e0cd1ad46c2cf.tar.gz drakx-7c74b82ced598699133943b28b2e0cd1ad46c2cf.tar.bz2 drakx-7c74b82ced598699133943b28b2e0cd1ad46c2cf.tar.xz drakx-7c74b82ced598699133943b28b2e0cd1ad46c2cf.zip | |
merge ia64
| -rw-r--r-- | perl-install/install_any.pm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index a555240a1..c3b058a9f 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -1042,11 +1042,23 @@ sub getHds { $o->{fstab} = [ fsedit::get_all_fstab($all_hds) ]; fs::merge_info_from_mtab($o->{fstab}); + #- Search for EFI partitions + my @efi = grep { isEfi($_) && isFat({ type => fsedit::typeOfPart($_->{device}) }) } @{$o->{fstab}}; + log::l("efi parts: ", join ",", map { $_->{device} } @efi) if @efi; + if (@efi == 1) { + $efi[0]{mntpoint} = "/boot/efi"; + } else { + my $v = 0; + foreach (@efi) { + $_->{mntpoint} = $_->{unsafeMntpoint} = "/mnt/efi_" . ($v ? $v+1 : ''); + $v = $v + 1; + } + } + my @win = grep { isFat($_) && isFat({ type => fsedit::typeOfPart($_->{device}) }) } @{$o->{fstab}}; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; if (@win == 1) { - #- Suggest /boot/efi on ia64. - $win[0]{mntpoint} = arch() =~ /ia64/ ? "/boot/efi" : "/mnt/windows"; + $win[0]{mntpoint} = "/mnt/windows"; } else { my %w; foreach (@win) { my $v = $w{$_->{device_windobe}}++; |