diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-19 12:28:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-19 12:28:41 +0000 |
| commit | ccab815627e5ad56367a204cc78a7e3ce0b26e37 (patch) | |
| tree | 7883566b8b4930b446794b66f101b1b462e5356e /perl-install/fs/type.pm | |
| parent | 8a3601d1eb4d6a747dce5cee462c2f1353f4e439 (diff) | |
| download | drakx-backup-do-not-use-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar drakx-backup-do-not-use-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar.gz drakx-backup-do-not-use-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar.bz2 drakx-backup-do-not-use-ccab815627e5ad56367a204cc78a7e3ce0b26e37.tar.xz drakx-backup-do-not-use-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/type.pm')
| -rw-r--r-- | perl-install/fs/type.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index 71995af77..c0f89266d 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -279,9 +279,6 @@ sub type_subpart_from_magic { my ($part) = @_; my $ids = call_vol_id($part); - $part->{LABEL_from_magic} = $ids->{ID_FS_LABEL} if $ids->{ID_FS_LABEL}; - $part->{UUID_from_magic} = $ids->{ID_FS_UUID} if $ids->{ID_FS_UUID}; - my $p; if ($ids->{ID_FS_USAGE} eq 'raid') { my $name = { @@ -297,6 +294,8 @@ sub type_subpart_from_magic { if ($p) { $part->{fs_type_from_magic} = $p->{fs_type}; + $p->{device_LABEL} = $ids->{ID_FS_LABEL} if $ids->{ID_FS_LABEL}; + $p->{device_UUID} = $ids->{ID_FS_UUID} if $ids->{ID_FS_UUID}; } $p; } |