summaryrefslogtreecommitdiffstats
path: root/perl-install/fsedit.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-19 12:28:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-19 12:28:41 +0000
commitccab815627e5ad56367a204cc78a7e3ce0b26e37 (patch)
tree7883566b8b4930b446794b66f101b1b462e5356e /perl-install/fsedit.pm
parent8a3601d1eb4d6a747dce5cee462c2f1353f4e439 (diff)
downloaddrakx-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar
drakx-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar.gz
drakx-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar.bz2
drakx-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar.xz
drakx-ccab815627e5ad56367a204cc78a7e3ce0b26e37.zip
- fix getting UUID on mdmadm (eg: md0) devices
the fix is to stop doing UUID_from_magic and LABEL_from_magic, and correctly set device_UUID and device_LABEL in the type_subpart returned by type_subpart_from_magic()
Diffstat (limited to 'perl-install/fsedit.pm')
-rw-r--r--perl-install/fsedit.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index adfc22f9d..1dc809ac4 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -245,17 +245,11 @@ Do you agree to lose all the partitions?
# checking the magic of the filesystem, do not rely on pt_type
foreach (@parts) {
if (my $type = fs::type::type_subpart_from_magic($_)) {
- if ($type->{fs_type}) {
- #- keep {pt_type}
- $_->{fs_type} = $type->{fs_type};
- } else {
- put_in_hash($_, $type);
- }
+ $type->{pt_type} = $_->{pt_type}; #- keep {pt_type}
+ put_in_hash($_, $type);
} else {
$_->{bad_fs_type_magic} = 1;
}
- $_->{device_LABEL} = $_->{LABEL_from_magic} if $_->{LABEL_from_magic};
- $_->{device_UUID} = $_->{UUID_from_magic} if $_->{UUID_from_magic};
}
if ($hd->{usb_media_type}) {