From 33d662b6ab593ff515a40304db4225afa014ba3c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 15 Apr 2013 07:07:51 +0000
Subject: retrieve minor/major for LVs too

thus fixing comparing in fs::get::is_same_hd():
            'device_alias' => 'mapper/vg--mga-root',
with:
            'device' => 'vg-mga/root',

thus fixing removing LVM entries when saving /etc/fstab (mga#5811)

(backported from trunk)
---
 perl-install/NEWS   | 1 +
 perl-install/lvm.pm | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 63c5209d0..9c8569a58 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
 - diskdrake:
+  o fix removing LVM entries when saving /etc/fstab (mga#5811)
   o offer resizing NTFS again (broken by ntfsprogs -> ntfs-3g switch)
 - drakclock:
   o do not crash if timezones cannot be listed (mga#6787)
diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm
index e2eeb4cdc..5bca97af9 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -119,10 +119,13 @@ sub get_lvs {
       [
        map {
 	   my $device = "$lvm->{VG_name}/$_";
+	   my $p = fs::wild_device::to_subpart("/dev/$device");
 	   my $part = {
 	     device => $device, 
 	     lv_name => $_,
 	     rootDevice => $lvm->{VG_name},
+	     minor => $p->{minor},
+	     major => $p->{major},
 	     size => get_lv_size($device) };
 	   if (my $type = -e "/dev/$device" && fs::type::type_subpart_from_magic($part)) {
                 put_in_hash($part, $type); 	       
-- 
cgit v1.2.1