summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-24 15:27:38 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-24 15:27:38 +0000
commit06c948a45f57ac1903f66adbb4727ffe34b6dba9 (patch)
treed182db91bbc1c36fdb4e48df70723f5e54c36325
parent3fb49c5f884368a2cdb94b108a146e5a7dc89304 (diff)
downloaddrakx-06c948a45f57ac1903f66adbb4727ffe34b6dba9.tar
drakx-06c948a45f57ac1903f66adbb4727ffe34b6dba9.tar.gz
drakx-06c948a45f57ac1903f66adbb4727ffe34b6dba9.tar.bz2
drakx-06c948a45f57ac1903f66adbb4727ffe34b6dba9.tar.xz
drakx-06c948a45f57ac1903f66adbb4727ffe34b6dba9.zip
cleanup
-rw-r--r--perl-install/network/netconnect.pm8
1 files changed, 2 insertions, 6 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index fae1f4fd0..1222cd9d6 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -233,9 +233,7 @@ sub get_subwizard {
hw_account =>
- { # ask_info2
- #my ($cnx, $netc) = @_;
-
+ {
name => N("Connection Configuration") . "\n\n" .
N("Please fill or check the field below"),
data => [
@@ -282,7 +280,6 @@ sub get_subwizard {
go_ethernet =>
{
pre => sub {
- # my ($netc, $intf, $type, $ipadr, $netadr, $first_time) = @_;
conf_network_card($netc, $intf, $type, $ipadr, $netadr) or return;
$netc->{NET_INTERFACE} = $netc->{NET_DEVICE};
configureNetwork($netc, $intf, $first_time) or return;
@@ -850,7 +847,6 @@ See iwpriv(8) man page for further information."),
conf_network_card =>
{
pre => sub {
- # my ($netc, $intf, $type, $ipadr, $o_netadr) = @_;
#-type =static or dhcp
modules::interactive::load_category($in, 'network/main|gigabit|usb', !$::expert, 1);
@all_cards = conf_network_card_backend($netc, $intf, $type, undef, $ipadr, $netadr) or
@@ -874,7 +870,6 @@ I cannot set up this connection type.")), return;
static_hostname =>
{
pre => sub {
-
$netc->{dnsServer} ||= dns($intf->{IPADDR});
$gateway_ex = gateway($intf->{IPADDR});
#- $netc->{GATEWAY} ||= gateway($intf->{IPADDR});
@@ -930,6 +925,7 @@ You may also enter the IP address of the gateway if you have one."),
post => $handle_multiple_cnx,
},
+
multiple_internet_cnx =>
{
name => N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center"),