diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-19 21:27:10 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-19 21:27:10 +0000 |
| commit | bcc4607d0b19cd7f9abf7027f44356fe86de267d (patch) | |
| tree | 736eed2dd39e485be617f9f77ab86df7848bf95f /perl-install/install_steps_interactive.pm | |
| parent | 4d37b8692e0c742479a518562f426616bf4929ef (diff) | |
| download | drakx-bcc4607d0b19cd7f9abf7027f44356fe86de267d.tar drakx-bcc4607d0b19cd7f9abf7027f44356fe86de267d.tar.gz drakx-bcc4607d0b19cd7f9abf7027f44356fe86de267d.tar.bz2 drakx-bcc4607d0b19cd7f9abf7027f44356fe86de267d.tar.xz drakx-bcc4607d0b19cd7f9abf7027f44356fe86de267d.zip | |
simplify
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index dcbd19c7b..77691020c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -393,12 +393,6 @@ sub choosePartitionsToFormat { return if @l == 0 || !$::expert && 0 == grep { ! $_->{toFormat} } @l; - my $name2label = sub { - sprintf("%s %s", - isSwap($_) ? type2name($_->{type}) : $_->{mntpoint}, - partition_table::description($_)); - }; - #- keep it temporary until the guy has accepted $_->{toFormatTmp} = $_->{toFormat} || $_->{toFormatUnsure} foreach @l; @@ -409,10 +403,10 @@ sub choosePartitionsToFormat { [ map { my $e = $_; ({ - text => $name2label->($e), type => 'bool', + text => partition_table::description($e), type => 'bool', val => \$e->{toFormatTmp} }, if_(!isLoopback($_) && !isThisFs("reiserfs", $_), { - text => $name2label->($e), type => 'bool', advanced => 1, + text => partition_table::description($e), type => 'bool', advanced => 1, disabled => sub { !$e->{toFormatTmp} }, val => \$e->{toFormatCheck} })) } @l ] |