diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-04-01 15:33:51 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-04-01 15:33:51 +0000 |
commit | 8eff4c085d451c8b2720c78c3664976034f75d4d (patch) | |
tree | 87612b9f126b951a97841ca240014f39fd88517b | |
parent | fe2f8abcd821db3bf6429855385f67786e30ae86 (diff) | |
download | drakx-8eff4c085d451c8b2720c78c3664976034f75d4d.tar drakx-8eff4c085d451c8b2720c78c3664976034f75d4d.tar.gz drakx-8eff4c085d451c8b2720c78c3664976034f75d4d.tar.bz2 drakx-8eff4c085d451c8b2720c78c3664976034f75d4d.tar.xz drakx-8eff4c085d451c8b2720c78c3664976034f75d4d.zip |
fix crash when detecting network connection with supplementary media
-rw-r--r-- | perl-install/install/NEWS | 2 | ||||
-rw-r--r-- | perl-install/install/any.pm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 51ee84322..347055a5a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix crash when detecting network connection with supplementary media + Version 10.23 - 31 March 2008 - ensure umount on loopback-mounted-file doesn't leak /dev/loop diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index fce0e0274..cee100845 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -143,9 +143,7 @@ sub prep_net_suppl_media { my ($o) = @_; require network::tools; - my (undef, $is_up, undef) = network::tools::get_internet_connection($o->{net}); - - return if our $net_suppl_media_configured && $is_up; + return if our $net_suppl_media_configured && network::tools::has_network_connection(); $net_suppl_media_configured = 1; #- install basesystem now |