summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-07-04 18:45:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-07-04 18:45:18 +0000
commit8211bf1044085f646de800b2680331d1450ff6d5 (patch)
treeddf024eb3052f53f1c0ea574c3ccf80d56ae2eef
parent017f52718b4e872371377701bc248be520dfbf9f (diff)
downloaddrakx-backup-do-not-use-8211bf1044085f646de800b2680331d1450ff6d5.tar
drakx-backup-do-not-use-8211bf1044085f646de800b2680331d1450ff6d5.tar.gz
drakx-backup-do-not-use-8211bf1044085f646de800b2680331d1450ff6d5.tar.bz2
drakx-backup-do-not-use-8211bf1044085f646de800b2680331d1450ff6d5.tar.xz
drakx-backup-do-not-use-8211bf1044085f646de800b2680331d1450ff6d5.zip
verify a /boot/efi partition exists
-rw-r--r--perl-install/install_interactive.pm4
-rw-r--r--perl-install/install_steps.pm4
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm
index a486a13ec..8f41bfa33 100644
--- a/perl-install/install_interactive.pm
+++ b/perl-install/install_interactive.pm
@@ -46,6 +46,10 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
$o->ask_warn('', _("You must have a swap partition")), $ok=0 if !$::expert;
$ok &&= $::expert || $o->ask_okcancel('', _("You don't have a swap partition\n\nContinue anyway?"));
}
+ if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $hds) {
+ $o->ask_warn('', _("You must have a FAT partition mounted in /boot/efi"));
+ $ok = '';
+ }
} until $ok;
1;
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 2725f4934..305374e95 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -152,6 +152,10 @@ sub doPartitionDisksAfter {
$o->{fstab} = [ fsedit::get_fstab(@{$o->{hds}}, @{$o->{lvms}}, $o->{raid}) ];
fsedit::get_root_($o->{fstab}) or die "Oops, no root partition";
+ if (arch() =~ /ia64/ && !fsedit::has_mntpoint("/boot/efi", $o->{hds}) {
+ die _("You must have a FAT partition mounted in /boot/efi");
+ }
+
if ($o->{partitioning}{use_existing_root}) {
#- ensure those partitions are mounted so that they are not proposed in choosePartitionsToFormat
fs::mount_part($_, $o->{prefix}) foreach grep { $_->{mntpoint} && !$_->{notFormatted} } @{$o->{fstab}};