summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-22 11:29:28 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-22 11:29:28 +0000
commit82d1c2accbbfcaeae873b22c28155d4a671bb60b (patch)
tree48c345692620fb03dec646698452d061c4b8097a
parentcb5959e3f804f0d4eba366c56aa66a268324d7b6 (diff)
downloaddrakx-82d1c2accbbfcaeae873b22c28155d4a671bb60b.tar
drakx-82d1c2accbbfcaeae873b22c28155d4a671bb60b.tar.gz
drakx-82d1c2accbbfcaeae873b22c28155d4a671bb60b.tar.bz2
drakx-82d1c2accbbfcaeae873b22c28155d4a671bb60b.tar.xz
drakx-82d1c2accbbfcaeae873b22c28155d4a671bb60b.zip
- bootloader-config:
o fix root=xxx parameter for "/" on lvm using UUID= in fstab (#36542)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/lvm.pm12
2 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3a053723d..0921d7fec 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- bootloader-config:
+ o fix root=xxx parameter for "/" on lvm using UUID= in fstab (#36542)
- adapt to perl 5.10.0
Version 10.6.5 - 14 January 2008
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
];
}