summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-09-16 16:10:32 +0000
committerOlivier Blin <oblin@mandriva.org>2005-09-16 16:10:32 +0000
commitda188129369fdbff0dfb3d280255dfba91d736b4 (patch)
tree1571ecec4f86044dd54b41227a8aafd842c8c414 /perl-install/install_steps_interactive.pm
parent034c6d8da3c3c3144ad29ceb05926858f2f67ff6 (diff)
downloaddrakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar.gz
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar.bz2
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.tar.xz
drakx-da188129369fdbff0dfb3d280255dfba91d736b4.zip
automatically configure DSL connection on installation from DSL
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 8 insertions, 2 deletions
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;
}
}