summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-20 18:22:19 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-20 18:22:19 +0000
commita44f8a1afaff964afd383c492baf0027e9b95d3a (patch)
tree9995f0b5ca5a92a189e3892147b9e8aa74692da6 /perl-install
parentb154c5277f8980c53a6961ba55f7c2e59ec63aaf (diff)
downloaddrakx-backup-do-not-use-a44f8a1afaff964afd383c492baf0027e9b95d3a.tar
drakx-backup-do-not-use-a44f8a1afaff964afd383c492baf0027e9b95d3a.tar.gz
drakx-backup-do-not-use-a44f8a1afaff964afd383c492baf0027e9b95d3a.tar.bz2
drakx-backup-do-not-use-a44f8a1afaff964afd383c492baf0027e9b95d3a.tar.xz
drakx-backup-do-not-use-a44f8a1afaff964afd383c492baf0027e9b95d3a.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 "")
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/raid.pm2
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);