summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-03-17 16:06:41 +0100
committerThomas Backlund <tmb@mageia.org>2015-03-20 21:09:40 +0159
commit716217b9dcc3722d444868aaa5dfab036829fb2a (patch)
tree46051095852c4a6ef6ad4c2455ddfc6a7507ad88
parente3924baec2b257eb30a419426202d671de009216 (diff)
downloaddrakx-716217b9dcc3722d444868aaa5dfab036829fb2a.tar
drakx-716217b9dcc3722d444868aaa5dfab036829fb2a.tar.gz
drakx-716217b9dcc3722d444868aaa5dfab036829fb2a.tar.bz2
drakx-716217b9dcc3722d444868aaa5dfab036829fb2a.tar.xz
drakx-716217b9dcc3722d444868aaa5dfab036829fb2a.zip
reuse existing ESP under UEFI
-rw-r--r--perl-install/fs/mount_point.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm
index 5e0c8f14b..9b25e5f1d 100644
--- a/perl-install/fs/mount_point.pm
+++ b/perl-install/fs/mount_point.pm
@@ -46,6 +46,12 @@ sub suggest_mount_points {
#- try to find other mount points via fstab
fs::merge_info_from_fstab($fstab, $handle->{dir}, $uniq, 'loose') if $mnt eq '/';
}
+ # reuse existing ESP under UEFI:
+ my @ESP = if_(is_uefi(), grep { isESP($_) } @$fstab);
+ if (@ESP) {
+ $ESP[0]{mntpoint} = '/boot/EFI';
+ delete $ESP[0]{unsafeMntpoint};
+ }
$_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @$fstab;
}