From 5d26d0cff18a0899fc14c7a8a0898203d927c860 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 21 Mar 2008 14:51:47 +0000
Subject: - diskdrake:   o fix setting mount point of a /dev/mdX (#39142)    
 (regression introduced in 10.8)

---
 perl-install/NEWS         | 3 +++
 perl-install/fsedit.pm    | 5 +++--
 perl-install/install/NEWS | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8103fec76..807eb181c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o fix setting mount point of a /dev/mdX (#39142)
+    (regression introduced in 10.8)
 - list gspca, ov51x-jpeg and qc-usb-messenger in webcam modules group
 - harddrake:
   o recommend using insensitive search (#39136)
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 2e8f05b2c..f2c363127 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -345,12 +345,13 @@ sub suggest_part {
 	fs::type::set_pt_type($_, $_->{pt_type}) if !exists $_->{fs_type};
     }
 
-    my $hd_size = fs::get::part2hd($part, $all_hds)->{totalsectors};
+    my $hd = fs::get::part2hd($part, $all_hds);
+    my $hd_size = $hd && $hd->{totalsectors}; # nb: no $hd if $part is /dev/mdX
     my $has_swap = any { isSwap($_) } fs::get::fstab($all_hds);
 
     my @local_suggestions =
       grep { !$_->{mntpoint} && !$_->{VG_name} || !fs::get::has_mntpoint($_->{mntpoint}, $all_hds) || isSwap($_) && !$has_swap }
-      grep { !$_->{min_hd_size} || $_->{min_hd_size} <= $hd_size }
+      grep { !$_->{min_hd_size} || !$hd_size || $_->{min_hd_size} <= $hd_size }
       grep { !$_->{hd} || $_->{hd} eq $part->{rootDevice} }
 	@$suggestions;
 
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 1d08f91a6..15b97d179 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o fix setting mount point of a /dev/mdX (#39142)
+    (regression introduced in 10.8)
 - when skipping bootloader installation, correctly say "None" in summary 
   (#39101)
 - correctly set country when given lang=xxx on /proc/cmdline
-- 
cgit v1.2.1