From 051ccacd30007afbfa6fd2e3a623bd81d6120b8b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 1 Oct 2007 07:44:22 +0000
Subject: - diskdrake:   o bugfix 10.4.162: allow "LVM" on RAID (#34359)

---
 perl-install/NEWS         | 3 +++
 perl-install/fs/type.pm   | 7 ++++---
 perl-install/install/NEWS | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3db4dd81a..2a5205935 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+  o bugfix 10.4.162: allow "LVM" on RAID (#34359)
+
 Version 10.4.222 - 28 September 2007, by Olivier "blino" Blin
 
 - allow interactive::gtk frontends to ask for a directory
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index c0f89266d..610802ac8 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -41,7 +41,7 @@ if_(arch() =~ /ppc/,
 ),
 	],
 
-        less_important => [
+        non_fs_type => [
   0x8e => '',         'Linux Logical Volume Manager',
   0xfd => '',         'Linux RAID',
 	],
@@ -181,11 +181,12 @@ if_(arch() !~ /ppc/,
 sub type_names { 
     my ($expert, $o_hd) = @_;
     my @l = @{$type_names{important}};
-    push @l, @{$type_names{less_important}}, sort @{$type_names{other}} if $expert;
+    push @l, @{$type_names{non_fs_type}}, sort @{$type_names{other}} if $expert;
     if ($o_hd && !$o_hd->use_pt_type) {
 	warn "$_ => $type_name2fs_type{$_}\n" foreach @l;
 	@l = grep { $type_name2fs_type{$_} } @l;
-	uniq_ { $type_name2fs_type{$_[0]} } @l;
+	@l = uniq_ { $type_name2fs_type{$_[0]} } @l;
+	(@l, @{$type_names{non_fs_type}});
     } else {
 	@l;
     }
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a0b533f97..c0631c658 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+  o bugfix 10.4.162: allow "LVM" on RAID (#34359)
 - add acpi-cpufreq support for some Intel CPUs (family 6 model 15)
   (from Herton Ronaldo Krzesinski, #30208)
 
-- 
cgit v1.2.1