diff options
author | Thierry Vignaud <tv@mageia.org> | 2013-04-05 13:33:20 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mageia.org> | 2013-04-05 13:33:20 +0000 |
commit | 50f338d07a4d177e72fc63ead3bf7d75c7d4853b (patch) | |
tree | e46c4fa12963bb2e9b3b3d72f7e0de6fa5275d97 | |
parent | ce6e9c8b6eeacac267eb85329780fadf3406892e (diff) | |
download | drakx-50f338d07a4d177e72fc63ead3bf7d75c7d4853b.tar drakx-50f338d07a4d177e72fc63ead3bf7d75c7d4853b.tar.gz drakx-50f338d07a4d177e72fc63ead3bf7d75c7d4853b.tar.bz2 drakx-50f338d07a4d177e72fc63ead3bf7d75c7d4853b.tar.xz drakx-50f338d07a4d177e72fc63ead3bf7d75c7d4853b.zip |
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)
-rw-r--r-- | perl-install/NEWS | 2 | ||||
-rw-r--r-- | perl-install/lvm.pm | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 324a87498..fb280f6b6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- diskdrake: + o fix removing LVM entries when saving /etc/fstab (mga#5811) - drakboot: o assume grub2.cfg is UTF-8 encoded o read back xen conf from grub2 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); |