From 2e817a5aa5b7edb57703002d08cf4a243b3dd32a Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 19 Mar 2008 15:34:58 +0000
Subject: do not configure network if already up

---
 perl-install/NEWS                      | 1 +
 perl-install/standalone/finish-install | 2 ++
 2 files changed, 3 insertions(+)

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);
-- 
cgit v1.2.1