From 7bb4358bb58b1ecda36c0a33b9162119bfc3695b Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Mon, 27 Apr 2009 15:22:01 +0000
Subject: Allow LVM in non expert mode and allow Encrypted partition inside LVM

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

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 41a26a8b3..62490ea78 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -5,6 +5,9 @@
   o fix reading default input method setting
   o do not try to install skim-scim-pinyin anymore, it is not
     available in 2009.0
+- diskdrake:
+  o allow LVM in non expert mode
+  o allow Encrypted partition inside LVM
 
 Version 11.71.8 - 25 February 2009
 
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index ee5769111..05ab7eb20 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -39,10 +39,10 @@ if_(arch() =~ /ppc/,
   0x402	=> 'hfs',      'Apple HFS Partition',
   0x41  => '',         'PPC PReP Boot',
 ),
-  0x83 => '',         'Encrypted',
 	],
 
         non_fs_type => [
+  0x83 => '',         'Encrypted',
   0x8e => '',         'Linux Logical Volume Manager',
   0xfd => '',         'Linux RAID',
 	],
@@ -183,7 +183,8 @@ if_(arch() !~ /ppc/,
 sub type_names { 
     my ($expert, $o_hd) = @_;
     my @l = @{$type_names{important}};
-    push @l, @{$type_names{non_fs_type}}, sort @{$type_names{other}} if $expert;
+    push @l, @{$type_names{non_fs_type}};
+    push @l, 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;
-- 
cgit v1.2.1