diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-05-05 10:39:25 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-05-05 10:39:25 +0000 |
| commit | 9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc (patch) | |
| tree | 1bbdab435011d98f31d94c9382f8b13e4143ec7f /perl-install/install_steps_interactive.pm | |
| parent | bbe401b766272753bd1d25942322fc3928132020 (diff) | |
| download | drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar.gz drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar.bz2 drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.tar.xz drakx-backup-do-not-use-9d42e52fa720c98850b2c6c58db7b3fe1b17e6dc.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1e52a1147..e8ec6c4fd 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -440,8 +440,7 @@ sub configureNetwork($) { #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain...")); #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf}); #- } - $last->{BOOTPROTO} =~ /^(dhcp|bootp)$/ || - $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) or return; + $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) if $last->{BOOTPROTO} !~ /^(dhcp|bootp)$/; } install_steps::configureNetwork($o); @@ -1180,7 +1179,7 @@ sub setup_thiskind { $r = $o->ask_from_list_('', $msg, $opt, "No") unless $at_least_one && @l == 0; if ($r eq "No") { return } elsif ($r eq "Yes") { - push @l, $o->load_module($type) || return; + push @l, $o->load_module($type) || next; } else { #-eval { commands::modprobe("isapnp") }; require pci_probing::main; |