diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-03-19 15:34:58 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-03-19 15:34:58 +0000 |
| commit | 2e817a5aa5b7edb57703002d08cf4a243b3dd32a (patch) | |
| tree | 504c82e3e172ab573d6de0d0e838bacc9ec3d5ee | |
| parent | 65bda0479fe38e6e1846edd1521990571b632e20 (diff) | |
| download | drakx-2e817a5aa5b7edb57703002d08cf4a243b3dd32a.tar drakx-2e817a5aa5b7edb57703002d08cf4a243b3dd32a.tar.gz drakx-2e817a5aa5b7edb57703002d08cf4a243b3dd32a.tar.bz2 drakx-2e817a5aa5b7edb57703002d08cf4a243b3dd32a.tar.xz drakx-2e817a5aa5b7edb57703002d08cf4a243b3dd32a.zip | |
do not configure network if already up
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 2 |
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); |