diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-10-06 09:12:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-10-06 09:12:56 +0000 |
| commit | 8f7cb6dae22fc5adc6eb8c57605e16f97cfee179 (patch) | |
| tree | 51a302870b37255a39a4758b4ceb24ed798e4fba /perl-install/install_steps_interactive.pm | |
| parent | ca14a502d413a9a80a035b7fe29541fcfe0da637 (diff) | |
| download | drakx-8f7cb6dae22fc5adc6eb8c57605e16f97cfee179.tar drakx-8f7cb6dae22fc5adc6eb8c57605e16f97cfee179.tar.gz drakx-8f7cb6dae22fc5adc6eb8c57605e16f97cfee179.tar.bz2 drakx-8f7cb6dae22fc5adc6eb8c57605e16f97cfee179.tar.xz drakx-8f7cb6dae22fc5adc6eb8c57605e16f97cfee179.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index b2e84025a..41052c851 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -181,7 +181,7 @@ sub configureNetwork($) { _("Do you want to configure LAN (not dialup) networking for your system?")) or $r = "Don't"; } - if ($r =~ /^Don\'t/) { + if ($r =~ /^Don't/) { #-' for xgettext $o->{netc}{NETWORKING} = "false"; } elsif ($r !~ /^Keep/) { $o->setup_thiskind('net', !$::expert, 1); @@ -608,6 +608,7 @@ You can add some more or change the existent ones."), $e = $b->{entries}{$name}; } my $old_name = $name; + my %old_e = %$e; my $default = my $old_default = $e->{label} eq $b->{default}; my @l; @@ -634,16 +635,18 @@ _("Label") => \$e->{label}, _("Default") => { val => \$default, type => 'bool' }, ); - $o->ask_from_entries_ref('', - '', - [ grep_index { even($::i) } @l ], - [ grep_index { odd($::i) } @l ], - ) or return; - - $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default}; - - delete $b->{entries}{$old_name}; - $b->{entries}{$name} = $e; + if ($o->ask_from_entries_ref('', + '', + [ grep_index { even($::i) } @l ], + [ grep_index { odd($::i) } @l ], + )) { + $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default}; + + delete $b->{entries}{$old_name}; + $b->{entries}{$name} = $e; + } else { + %$e = %old_e; + } } eval { $o->SUPER::setupBootloader }; if ($@) { |