summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2014-07-01 22:58:44 +0300
committerThomas Backlund <tmb@mageia.org>2014-07-01 22:58:44 +0300
commit4742a2c44354136dfa18323d46cacc678ebe97a5 (patch)
treeaa0f7db87922cbc03f1c7aef621c9f12fac1478f
parent4c51a1c73d374c8edaa7e27a36d8da3fed5bcb69 (diff)
downloaddrakx-4742a2c44354136dfa18323d46cacc678ebe97a5.tar
drakx-4742a2c44354136dfa18323d46cacc678ebe97a5.tar.gz
drakx-4742a2c44354136dfa18323d46cacc678ebe97a5.tar.bz2
drakx-4742a2c44354136dfa18323d46cacc678ebe97a5.tar.xz
drakx-4742a2c44354136dfa18323d46cacc678ebe97a5.zip
hide /boot/efi check for now (mga#13638)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fs/partitioning_wizard.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2f5f29e86..f83b8a75b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- hide /boot/efi check for now (mga#13638)
- fix not being able to select packages when list contains only one (mga#13492)
Version 16.34 - 26 June 2014
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 7294350ab..101d70ccc 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -64,7 +64,7 @@ Then choose action ``Mount point'' and set it to `/'"), 1) or return;
if (!any { isSwap($_) } @fstab) {
$ok &&= $in->ask_okcancel('', N("You do not have a swap partition.\n\nContinue anyway?"));
}
- if (!fs::get::has_mntpoint("/boot/efi", $all_hds)) {
+ if (arch() =~ /ia64/ && !fs::get::has_mntpoint("/boot/efi", $all_hds)) {
$in->ask_warn('', N("You must have a FAT partition mounted in /boot/efi"));
$ok = '';
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3afdcc574..c5d0f2dfa 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- hide /boot/efi check for now (mga#13638)
+
Version 16.35 - 29 June 2014
- Mageia 5 alpha 1 left background