diff options
author | Pascal Terjan <pterjan@mageia.org> | 2012-04-24 21:58:30 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@mageia.org> | 2012-04-24 21:58:30 +0000 |
commit | b89ccd4c3a313a13536438135d0c8e96ceb7ad5a (patch) | |
tree | 56fd3dfed5cbac310448611aa8bc1fe8fc273816 /perl-install/diskdrake/hd_gtk.pm | |
parent | 2644a0c335af43c91f6af6bfac5a6c850e7273f3 (diff) | |
download | drakx-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/diskdrake/hd_gtk.pm')
-rw-r--r-- | perl-install/diskdrake/hd_gtk.pm | 24 |
1 files changed, 17 insertions, 7 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 ################################################################################ |