summaryrefslogtreecommitdiffstats
path: root/perl-install/fs/format.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/fs/format.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/fs/format.pm')
-rw-r--r--perl-install/fs/format.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 157d24701..91b470964 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -128,9 +128,8 @@ sub part_raw {
disable_forced_fsck($dev);
}
- delete $part->{UUID_from_magic};
- fs::type::type_subpart_from_magic($part);
- $part->{device_UUID} = $part->{UUID_from_magic};
+ my $p = fs::type::type_subpart_from_magic($part);
+ $part->{device_UUID} = $p && $p->{device_UUID};
set_isFormatted($part, 1);
}