summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/finish-install2
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a732ed588..91452f175 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- use UUID by default (for diskdrake and draklive-install)
- finish-install:
o write modprobe.conf after configuring network
+ o do not configure network if already up
Version 10.16.1 - 18 March 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index eeded47b9..d817c8fda 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -65,6 +65,8 @@ sub ask_timezone() {
}
sub ask_network() {
+ require network::tools;
+ return if network::tools::has_network_connection();
require network::netconnect;
my $modules_conf = modules::any_conf->read;
network::netconnect::real_main($net, $in, $modules_conf);