summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-10-05 19:56:45 +0000
committerdamien <damien@mandriva.com>2000-10-05 19:56:45 +0000
commit32ffa5852bbaf28a57bf1d6304b4ca57350d61d2 (patch)
tree0c806743660b31263c826e078882d3f34332e1cb
parent420432e5619fcc647f5daaa2bc21b9bae0cdd237 (diff)
downloaddrakx-32ffa5852bbaf28a57bf1d6304b4ca57350d61d2.tar
drakx-32ffa5852bbaf28a57bf1d6304b4ca57350d61d2.tar.gz
drakx-32ffa5852bbaf28a57bf1d6304b4ca57350d61d2.tar.bz2
drakx-32ffa5852bbaf28a57bf1d6304b4ca57350d61d2.tar.xz
drakx-32ffa5852bbaf28a57bf1d6304b4ca57350d61d2.zip
updated
-rw-r--r--perl-install/ChangeLog4
-rw-r--r--perl-install/network.pm1
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index e683ecf46..ed73ab125 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,6 +1,10 @@
2000-10-05 dam's <damien@mandrakesoft.com>
* netconnect.pm (adsl_conf): updated pppoe conf.
+ (main): added $netc->{minus_one} to avoid to count dhcp configured
+ eth when asking to share the connection.
+ (adsl-pppoe): improvement. Should work now.
+
* netconnect.pm (main): network is stopped then started, instead
of restarted.
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 598949fff..1e54c4e32 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -267,6 +267,7 @@ sub configureNetwork {
#- }
$last or return;
if ($last->{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
+ $netc->{minus_one} = 1;
my $dhcp_hostname = $netc->{HOSTNAME};
$::isInstall and $in->set_help('configureNetworkHostDHCP');
$in->ask_from_entries_ref(_("Configuring network"),