From 7d6a3fd003f5464172be07802f163d101ba38faa Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Fri, 20 Mar 2009 18:12:08 +0000
Subject: - diskdrake:   o allow LVM in non expert mode   o allow Encrypted
 partition inside LVM

---
 perl-install/fs/type.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/fs')

diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index e59ca28bb..e859b6fc2 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -40,10 +40,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