diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-05-03 21:01:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-05-03 21:01:20 +0000 |
| commit | ded2e3634359abc227f6bf9c378729dfb2ca09f1 (patch) | |
| tree | 8aad44fc5d6e68d618be69fbb6a6b412336d7647 | |
| parent | 88d33875b772a7ade8f61658233f04b7c4bb43c8 (diff) | |
| download | drakx-ded2e3634359abc227f6bf9c378729dfb2ca09f1.tar drakx-ded2e3634359abc227f6bf9c378729dfb2ca09f1.tar.gz drakx-ded2e3634359abc227f6bf9c378729dfb2ca09f1.tar.bz2 drakx-ded2e3634359abc227f6bf9c378729dfb2ca09f1.tar.xz drakx-ded2e3634359abc227f6bf9c378729dfb2ca09f1.zip | |
no_comment
| -rw-r--r-- | perl-install/ChangeLog | 3 | ||||
| -rw-r--r-- | perl-install/any.pm | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 165dc1e6d..236ff2e3b 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,8 @@ 2000-05-03 Pixel <pixel@mandrakesoft.com> + * any.pm (setupBootloader): replace ask_many_from_list by + ask_from_list for bootloader choice + * services.pm (drakxservices): stop immediately service if removed * install_steps.pm (configureNetwork): replaced dhcpxd by dhcpcd diff --git a/perl-install/any.pm b/perl-install/any.pm index 61ad2d7ec..34c7e1720 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -69,9 +69,11 @@ sub setupBootloader { } elsif ($more || !$::beginner) { $in->set_help("setupBootloaderGeneral") unless $::isStandalone; - my @m = keys %{$b->{methods}}; - $::expert and $in->ask_many_from_list_ref('', _("Which bootloader(s) do you want to use?"), - [ @m ], [ map { \$b->{methods}{$_} } @m ]) || return; + if ($::expert) { + my $m = $in->ask_from_list_('', _("Which bootloader(s) do you want to use?"), [ keys(%{$b->{methods}}), __("None") ]) or return; + $b->{methods}{$_} = 0 foreach keys %{$b->{methods}}; + $b->{methods}{$m} = 1 if $m ne "None"; + } #- at least one method grep_each { $::b } %{$b->{methods}} or return; |