From 5efbf00cc1845b67ac7d4a03b9a75ecf18e50004 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 8 Apr 2015 08:13:53 -0400
Subject: don't guess a drive letter for recovery partitions

thus fixing mga15636
---
 perl-install/NEWS               | 2 ++
 perl-install/install/NEWS       | 2 ++
 perl-install/partition_table.pm | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 792fe3376..da48da67d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+  o don't guess a drive letter for recovery partitions (mga15636)
 - drakboot:
   o check there's still some place on /boot with grub2 too
   o generate core.img for UEFI
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5408eb6a0..d8c1fc615 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,8 @@
   o fix detecting grub2 on UEFI
   o write /boot/grub2/install.sh like for grub instead of drakboot.conf
 - log grub2 config in report.bug like for grub/lilo
+- partitionning:
+  o don't guess a drive letter for recovery partitions (mga15636)
 
 Version 16.79 - 7 April 2015
 
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index be54d6c31..d376de621 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -137,7 +137,7 @@ sub assign_device_numbers {
 
     $i = ord 'C';
     $c->{device_windobe} = chr($i++) if $c;
-    $_->{device_windobe} = chr($i++) foreach grep { isFat_or_NTFS($_) } map { $_->{normal} } @{$hd->{extended}};
+    $_->{device_windobe} = chr($i++) foreach grep { isFat_or_NTFS($_) && !isRecovery($_) } map { $_->{normal} } @{$hd->{extended}};
     $_->{device_windobe} = chr($i++) foreach @others;
 }
 
-- 
cgit v1.2.1