From da188129369fdbff0dfb3d280255dfba91d736b4 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 16 Sep 2005 16:10:32 +0000
Subject: automatically configure DSL connection on installation from DSL

---
 perl-install/install_steps_interactive.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 0b56615ea..fffc4b81d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -789,8 +789,14 @@ sub configureNetwork {
 	require network::netconnect;
 	network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
     } else {
-	require network::network;
-	network::network::easy_dhcp($o->{net}, $o->{modules_conf});
+	#- don't overwrite configuration in a network install
+	if (!install_any::is_network_install($o)) {
+	    require network::network;
+	    network::network::easy_dhcp($o->{net}, $o->{modules_conf});
+	} elsif ($o->{net}{type} eq 'adsl') {
+	    require network::adsl;
+	    network::adsl::adsl_conf_backend($o, $o->{modules_conf}, $o->{net});
+	}
 	$o->SUPER::configureNetwork;
     }
 }
-- 
cgit v1.2.1