diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-04-20 18:22:19 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-04-20 18:22:19 +0000 |
| commit | bc79948732556dfd73a422adbaf5f9290aeec4cf (patch) | |
| tree | 9995f0b5ca5a92a189e3892147b9e8aa74692da6 | |
| parent | 5116d0330c6a1bf0546fecd468ff13029f78aaf5 (diff) | |
| download | drakx-bc79948732556dfd73a422adbaf5f9290aeec4cf.tar drakx-bc79948732556dfd73a422adbaf5f9290aeec4cf.tar.gz drakx-bc79948732556dfd73a422adbaf5f9290aeec4cf.tar.bz2 drakx-bc79948732556dfd73a422adbaf5f9290aeec4cf.tar.xz drakx-bc79948732556dfd73a422adbaf5f9290aeec4cf.zip | |
(raid2real_kind) fix displaying empty info about RAID devices
we now display "<device> (RAID level)" (eg: 'md0 (RAID1)')
(actually we were displaying "mdX" since two previous commits but all
released installers were displaying "")
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/raid.pm | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 3ff8c7803..cd611b1cd 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - partitioning wizard: o do not crash on selecting a RAID device + o fix displaying empty info about RAID devices o fix listing RAID devices Version 14.7 - 19 April 2012 diff --git a/perl-install/raid.pm b/perl-install/raid.pm index 5f779a444..2c1c86e53 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -235,11 +235,13 @@ sub get_existing { } } split(',', $raw_part->{devices}); + my ($info) = $md =~ m!([^/]*)$!; my $md_part = new($raids, device => $md, UUID => $raw_part->{UUID}, level => $raw_part->{level}, metadata => $raw_part->{metadata}, + info => $info . " (RAID$raw_part->{level})", disks => \@mdparts); my $type = fs::type::type_subpart_from_magic($md_part); |