diff options
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index a1b69edba..cdeefb372 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -238,7 +238,7 @@ sub configureNetwork { #- get current configuration of network device. require network; eval { network::read_all_conf($o->{prefix}, $o->{netc} ||= {}, $o->{intf} ||= {}) }; - installStepsCall($o, $auto, 'configureNetwork', $ent_number == 1, $clicked); + installStepsCall($o, $auto, 'configureNetwork'); } #------------------------------------------------------------------------------ sub installUpdates { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 97bca2f95..7a08f803d 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -698,10 +698,9 @@ sub updateModulesFromFloppy { #------------------------------------------------------------------------------ sub configureNetwork { - my ($o, $first_time, $noauto) = @_; - require network::netconnect; - network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf}, - $first_time, $o->{lang} eq "fr_FR" && $o->{keyboard}{KEYBOARD} eq "fr", $noauto); + my ($o) = @_; + require network::network; + network::network::easy_dhcp($o, $o->{netc}, $o->{intf}); } #------------------------------------------------------------------------------ @@ -851,10 +850,11 @@ sub summary { { label => N("Timezone"), val => \$o->{timezone}{timezone}, clicked => sub { $o->configureTimezone(1) } }, { label => N("Printer"), val => \$o->{printer}, clicked => sub { $o->configurePrinter(1) }, format => $format_printers }, { label => N("Bootloader"), val => \$o->{bootloader}, clicked => sub { any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) }, format => sub { "$o->{bootloader}{method} on $o->{bootloader}{boot}" } }, -{ label => N("Graphical interface"), val => \$o->{raw_X}, clicked => sub { configureX($o, 'expert') }, format => sub { $o->{raw_X} ? Xconfig::resolution_and_depth::to_string($o->{raw_X}->get_resolution) : '' } }, - (map { -{ label => N("ISDN card"), val => $_->{description}, clicked => sub { $o->configureNetwork } } - } grep { $_->{driver} eq 'hisax' } detect_devices::probeall()), +{ label => N("Graphical interface"), val => \$o->{raw_X}, clicked => sub { configureX($o, 'expert') }, format => sub { $o->{raw_X} ? Xconfig::resolution_and_depth::to_string($o->{raw_X}->get_resolution) : N("not configured") } }, +{ label => N("Network"), val => \$o->{netcnx}{type}, format => sub { $_[0] || N("not configured") }, clicked => sub { + require network::netconnect; + network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf}, 0, $o->{lang} eq "fr_FR" && $o->{keyboard}{KEYBOARD} eq "fr", 1); + } }, (map { my $device = $_; { label => N("Sound card"), val => $_->{description}, clicked => sub { |