summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2012-04-24 21:58:30 +0000
committerPascal Terjan <pterjan@mageia.org>2012-04-24 21:58:30 +0000
commitb89ccd4c3a313a13536438135d0c8e96ceb7ad5a (patch)
tree56fd3dfed5cbac310448611aa8bc1fe8fc273816 /perl-install
parent2644a0c335af43c91f6af6bfac5a6c850e7273f3 (diff)
downloaddrakx-backup-do-not-use-b89ccd4c3a313a13536438135d0c8e96ceb7ad5a.tar
drakx-backup-do-not-use-b89ccd4c3a313a13536438135d0c8e96ceb7ad5a.tar.gz
drakx-backup-do-not-use-b89ccd4c3a313a13536438135d0c8e96ceb7ad5a.tar.bz2
drakx-backup-do-not-use-b89ccd4c3a313a13536438135d0c8e96ceb7ad5a.tar.xz
drakx-backup-do-not-use-b89ccd4c3a313a13536438135d0c8e96ceb7ad5a.zip
reuse code from hd_gtk, fixes display of "Use free space" solution
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/diskdrake/hd_gtk.pm24
-rw-r--r--perl-install/fs/partitioning_wizard.pm5
-rw-r--r--perl-install/install/NEWS1
3 files changed, 20 insertions, 10 deletions
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 3ccc84d12..8b205df29 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -250,13 +250,8 @@ sub current_kind_changed {
my ($_in, $kind) = @_;
$_->destroy foreach $kind->{display_box}->get_children;
-
- my $v = $kind->{val};
- my @parts =
- $kind->{type} eq 'raid' ? grep { $_ } @$v :
- $kind->{type} eq 'loopback' ? @$v : fs::get::hds_fstab_and_holes($v);
- my $totalsectors =
- $kind->{type} =~ /raid|loopback/ ? sum(map { $_->{size} } @parts) : $v->{totalsectors};
+ my @parts = kind2parts($kind);
+ my $totalsectors = kind2sectors($kind, @parts);
create_buttons4partitions($kind, $totalsectors, @parts);
}
@@ -433,6 +428,21 @@ sub createOrChangeType {
}
}
+sub kind2parts {
+ my ($kind) = @_;
+ my $v = $kind->{val};
+ my @parts =
+ $kind->{type} eq 'raid' ? grep { $_ } @$v :
+ $kind->{type} eq 'loopback' ? @$v : fs::get::hds_fstab_and_holes($v);
+ @parts;
+}
+
+sub kind2sectors {
+ my ($kind, @parts) = @_;
+ my $v = $kind->{val};
+ $kind->{type} =~ /raid|loopback/ ? sum(map { $_->{size} } @parts) : $v->{totalsectors};
+}
+
################################################################################
# lvms: helpers
################################################################################
diff --git a/perl-install/fs/partitioning_wizard.pm b/perl-install/fs/partitioning_wizard.pm
index 7712301c3..58acbf54d 100644
--- a/perl-install/fs/partitioning_wizard.pm
+++ b/perl-install/fs/partitioning_wizard.pm
@@ -287,10 +287,9 @@ sub warn_reboot_needed {
sub create_display_box {
my ($kind, $resize, $fill_empty, $button) = @_;
- # perl_checker: require UNIVERSAL
- my @parts = fs::get::hds_fstab_and_holes($kind->{val}) if UNIVERSAL::can($kind->{val}, 'first_usable_sector,');
- my $totalsectors = $kind->{val}{totalsectors};
+ my @parts = diskdrake::hd_gtk::kind2parts($kind);
+ my $totalsectors = diskdrake::hd_gtk::kind2sectors($kind, @parts);
my $width = 540;
my $minwidth = 40;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0263453f3..66b06878f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -7,6 +7,7 @@
o systemd support (mga#3253, mga#3740, mga#4910, mga#5122)
- partitioning wizard:
o fix removing several notebook pages
+ o reuse code from hd_gtk, fixes display of "Use free space" solution
Version 14.10 - 23 April 2012