summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/network.pm6
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 42aa57538..bf74f39f0 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-25 dam's <damien@mandrakesoft.com>
+
+ * network.pm (configureNetwork): Warn user if he already
+ configured the interface.
+
2000-09-24 Pixel <pixel@mandrakesoft.com>
* modules.pm (mergein_conf): created. call read_conf, fills
diff --git a/perl-install/network.pm b/perl-install/network.pm
index b28482edc..4ba9f3c16 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -253,7 +253,7 @@ sub configureNetwork {
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) or last;
$netc ||= {};
$last = $intf2;
@@ -284,8 +284,8 @@ sub configureNetworkIntf {
if ($net_device eq $intf->{DEVICE}) {
$skip and return 1;
$text = _("WARNING : This device has been previously configured to connect to the Internet.
-Simply press Cancel to keep this device configured.
-Modifying the fields below and clicking on OK will override this configuration.");
+Simply press OK to keep this device configured.
+Modifying the fields below will override this configuration.");
}
else {
$text = _("Please enter the IP configuration for this machine.