From 82d1c2accbbfcaeae873b22c28155d4a671bb60b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 22 Jan 2008 11:29:28 +0000
Subject: - bootloader-config:   o fix root=xxx parameter for "/" on lvm using
 UUID= in fstab (#36542)

---
 perl-install/lvm.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'perl-install/lvm.pm')

diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm
index 3bc670bad..f33b22522 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -111,13 +111,17 @@ sub get_lvs {
       [
        map {
 	   my $device = "$lvm->{VG_name}/$_";
-	   my $fs_type = -e "/dev/$device" && fs::type::fs_type_from_magic({ device => $device });
-
-	   { device => $device, 
+	   my $part = {
+	     device => $device, 
 	     lv_name => $_,
 	     rootDevice => $lvm->{VG_name},
-	     fs_type => $fs_type || 'ext2',
 	     size => get_lv_size($device) };
+	   if (my $type = -e "/dev/$device" && fs::type::type_subpart_from_magic($part)) {
+                put_in_hash($part, $type); 	       
+	   } else {
+	       $part->{fs_type} = 'ext2';
+	   }
+	   $part;
        } @l
       ];
 }
-- 
cgit v1.2.1