diff options
| author | damien <damien@mandriva.com> | 2001-01-25 03:09:19 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-01-25 03:09:19 +0000 |
| commit | e43af93c02493ebf8becbab5ed5950ec7745e259 (patch) | |
| tree | 4f277f67842f9f6a254fb2a3320a70c786121008 | |
| parent | 3cc263d04422dc4dd1efe9a05d4576897422f8ae (diff) | |
| download | drakx-e43af93c02493ebf8becbab5ed5950ec7745e259.tar drakx-e43af93c02493ebf8becbab5ed5950ec7745e259.tar.gz drakx-e43af93c02493ebf8becbab5ed5950ec7745e259.tar.bz2 drakx-e43af93c02493ebf8becbab5ed5950ec7745e259.tar.xz drakx-e43af93c02493ebf8becbab5ed5950ec7745e259.zip | |
display ethernet module
| -rw-r--r-- | perl-install/network.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/network.pm b/perl-install/network.pm index 5e687c857..a2bd99553 100644 --- a/perl-install/network.pm +++ b/perl-install/network.pm @@ -253,15 +253,18 @@ sub configureNetwork { local $_; any::setup_thiskind($in, 'net', !$::expert, 1); my @l = detect_devices::getNet() or die _("no network card found"); + my @all_cards = netconnect::conf_network_card_backend ($prefix, $netc, $intf, undef, undef, undef, undef); + my $n_card=0; my $last; foreach ($::beginner ? $l[0] : @l) { my $intf2 = findIntf($intf ||= {}, $_); add2hash($intf2, $last); add2hash($intf2, { NETMASK => '255.255.255.0' }); - configureNetworkIntf($in, $intf2, $netc->{NET_DEVICE}, 0) or last; + configureNetworkIntf($in, $intf2, $netc->{NET_DEVICE}, 0, $all_cards[$n_card]->[1]) or last; $netc ||= {}; $last = $intf2; + $n_card++; } #- { #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain...")); @@ -292,7 +295,7 @@ such as ``mybox.mylab.myco.com''."), sub configureNetworkIntf { - my ($in, $intf, $net_device, $skip) = @_; + my ($in, $intf, $net_device, $skip, $module) = @_; my $text; if ($net_device eq $intf->{DEVICE}) { $skip and return 1; @@ -311,7 +314,7 @@ notation (for example, 1.2.3.4)."); my @fields = qw(IPADDR NETMASK); $::isStandalone or $in->set_help('configureNetworkIP'); $in->ask_from_entries_ref(_("Configuring network device %s", $intf->{DEVICE}), - ($::isStandalone ? '' : _("Configuring network device %s", $intf->{DEVICE}) . "\n\n") . + ($::isStandalone ? '' : _("Configuring network device %s", $intf->{DEVICE}) . ( $module ? _(" (driver $module)") : '' ) . ( $intf->{DEVICE} eq 'eth0' && $in->{meta_class} eq 'firewall' ? _("\nWARNING: eth0 is the network card connected to your LAN.\n"): '' ) . "\n\n") . $text, [ _("IP address"), _("Netmask"), _("Automatic IP") ], [ \$intf->{IPADDR}, \$intf->{NETMASK}, { val => \$pump, type => "bool", text => _("(bootp/dhcp)") } ], |