summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-22 16:16:26 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-22 16:16:26 +0000
commita94c052ebe31ffb518b870d6bf63fb6538441196 (patch)
treec0984415b74fb7b48a2623e7fa96008d5d1bda45
parent00aad6c5c679575907da258659cc4095d8689f03 (diff)
downloaddrakx-a94c052ebe31ffb518b870d6bf63fb6538441196.tar
drakx-a94c052ebe31ffb518b870d6bf63fb6538441196.tar.gz
drakx-a94c052ebe31ffb518b870d6bf63fb6538441196.tar.bz2
drakx-a94c052ebe31ffb518b870d6bf63fb6538441196.tar.xz
drakx-a94c052ebe31ffb518b870d6bf63fb6538441196.zip
rollback debug stuff :-(
-rw-r--r--perl-install/network/netconnect.pm22
1 files changed, 15 insertions, 7 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index b9afb72a5..edad4330e 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -738,12 +738,6 @@ notation (for example, 1.2.3.4).")),
$ethntf->{MII_NOT_SUPPORTED} = bool2yesno(!$hotplug);
$ethntf->{HWADDR} = $track_network_id or delete $ethntf->{HWADDR};
$in->do_pkgs->install($netcnx->{dhcp_client}) if $auto_ip;
- write_cnx_script($netc, "cable", qq(
-/sbin/ifup $netc->{NET_DEVICE}
-),
- qq(
-/sbin/ifdown $netc->{NET_DEVICE}
-), $netcnx->{type}) if $netcnx->{type} eq 'cable';
return is_wireless_intf($module) ? "wireless" : "static_hostname";
},
@@ -848,6 +842,7 @@ 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});
@@ -881,6 +876,20 @@ You may also enter the IP address of the gateway if you have one."),
$in->ask_warn(N("Error"), N("Gateway address should be in format 1.2.3.4"));
return 1;
}
+ },
+ #post => $handle_multiple_cnx,
+ next => "zeroconf",
+ },
+
+ dhcp_hostname =>
+ {
+ },
+
+ zeroconf =>
+ {
+ name => N("Enter a Zeroconf host name which will be the one that your machine will get back to other machines on the network:"),
+ data => [ { label => N("Zeroconf Host name"), val => \$netc->{ZEROCONF_HOSTNAME} } ],
+ complete => sub {
if ($netc->{ZEROCONF_HOSTNAME} =~ /\./) {
$in->ask_warn(N("Error"), N("Zeroconf host name must not contain a ."));
return 1;
@@ -889,7 +898,6 @@ 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"),