diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-03-30 03:37:51 -0400 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-03-30 15:07:44 +0259 |
| commit | 0f907160598cc726a639fe06d1902f0e0811bb81 (patch) | |
| tree | 0ebac21f1eb02fd11fa8d7e7a10261fcd5476bf6 | |
| parent | ce81643e8e2e3ac78ec4ec4f5ba732f4cf29fb54 (diff) | |
| download | drakx-0f907160598cc726a639fe06d1902f0e0811bb81.tar drakx-0f907160598cc726a639fe06d1902f0e0811bb81.tar.gz drakx-0f907160598cc726a639fe06d1902f0e0811bb81.tar.bz2 drakx-0f907160598cc726a639fe06d1902f0e0811bb81.tar.xz drakx-0f907160598cc726a639fe06d1902f0e0811bb81.zip | |
fix getting ESP with "use free space"
make sure to not override /boot/EFI mount point with /media/win_X
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/fs/mount_point.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 1287430e3..91e9aae6f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,5 +1,7 @@ - diskdrake: o better fix for fail to read too corrupted partition table + o fix getting ESP with "use free space": + make sure to not override /boot/EFI mount point with /media/win_X o make sure to check for existing ESP on all disks o try to detect recovery partitions on GPT - stage2: diff --git a/perl-install/fs/mount_point.pm b/perl-install/fs/mount_point.pm index 9c6996dc3..e4f4ac1c9 100644 --- a/perl-install/fs/mount_point.pm +++ b/perl-install/fs/mount_point.pm @@ -62,7 +62,7 @@ sub suggest_mount_points_always { if (@ESP) { $ESP[0]{mntpoint} = "/boot/EFI"; } - my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && !isRecovery($_) } @$fstab; + my @win = grep { isFat_or_NTFS($_) && !$_->{isMounted} && maybeFormatted($_) && !$_->{is_removable} && !isRecovery($_) && !isESP($_) } @$fstab; log::l("win parts: ", join ",", map { $_->{device} } @win) if @win; if (@win == 1) { $win[0]{mntpoint} = "/media/windows"; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 43a10bbc0..b7ae2ae30 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,7 @@ - partitionning: o better fix for fail to read too corrupted partition table + o fix getting ESP with "use free space": + make sure to not override /boot/EFI mount point with /media/win_X o make sure to check for existing ESP on all disks o try to detect recovery partitions on GPT |