diff options
| author | damien <damien@mandriva.com> | 2001-08-27 22:33:16 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-08-27 22:33:16 +0000 |
| commit | 3748f5a4718f6ec99328ccea1ff161ac191c1f35 (patch) | |
| tree | e3d926fc8554ad9a2b0668294e454acbc883ece2 | |
| parent | ef63e3c19166bb5e05d8dc47ff492910da0578b5 (diff) | |
| download | drakx-3748f5a4718f6ec99328ccea1ff161ac191c1f35.tar drakx-3748f5a4718f6ec99328ccea1ff161ac191c1f35.tar.gz drakx-3748f5a4718f6ec99328ccea1ff161ac191c1f35.tar.bz2 drakx-3748f5a4718f6ec99328ccea1ff161ac191c1f35.tar.xz drakx-3748f5a4718f6ec99328ccea1ff161ac191c1f35.zip | |
corrected hwaddr setting and draknet first window display
| -rw-r--r-- | perl-install/network/netconnect.pm | 8 | ||||
| -rw-r--r-- | perl-install/network/network.pm | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index e1d50f2e9..46baaf763 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -181,7 +181,13 @@ ifdown eth0 ); my $i=0; map { defined $set_default or do { $_->[1] and $set_default=$i; }; $i++; } @l; - @l = map { $_->[0] = $_->[0] . if_($_->[1], " - " . _ ($_->[2], $_->[1])) } @l; + @l = ( +[_("Normal modem connection") . if_($netc->{autodetect}{modem}, " - " . _("detected on port %s", $netc->{autodetect}{modem})), \$conf{modem}], +[_("ISDN connection") . if_($netc->{autodetect}{isdn}{description}, " - " . _("detected %s", $netc->{autodetect}{isdn}{description})), \$conf{isdn}], +[_("ADSL connection") . if_($netc->{autodetect}{adsl}, " - " . _("detected on interface %s", $netc->{autodetect}{adsl})), \$conf{adsl}], +[_("Cable connection") . if_($netc->{autodetect}{cable}, " - " . _("cable connection detected")), \$conf{cable}], +[_("LAN connection") . if_($netc->{autodetect}{lan}, " - " . _("ethernet card(s) detected")), \$conf{lan}] +); my $e = $in->ask_from(_("Network Configuration Wizard"), _("Choose the connection you want to configure"), [ map { { label => $_->[0], val => $_->[1], type => 'bool'} } @l ] ) or goto step_1; diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index deffd0467..012e0db9c 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -113,7 +113,7 @@ sub write_resolv_conf { } sub write_interface_conf { - my ($file, $intf) = @_; + my ($file, $intf, $prefix) = @_; my @ip = split '\.', $intf->{IPADDR}; my @mask = split '\.', $intf->{NETMASK}; @@ -418,7 +418,7 @@ sub configureNetwork2 { $netc->{wireless_eth} and $in->do_pkgs->install('wireless-tools'); write_conf("$etc/sysconfig/network", $netc); write_resolv_conf("$etc/resolv.conf", $netc); - write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_) foreach grep { $_->{DEVICE} } values %$intf; + write_interface_conf("$etc/sysconfig/network-scripts/ifcfg-$_->{DEVICE}", $_, $prefix) foreach grep { $_->{DEVICE} } values %$intf; add2hosts("$etc/hosts", $netc->{HOSTNAME}, map { $_->{IPADDR} } values %$intf); if (grep { $_->{BOOTPROTO} =~ /^(dhcp)$/ } values %$intf) { |