summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm2
-rwxr-xr-xperl-install/standalone/finish-install3
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5eff4702f..1645ed201 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -840,6 +840,8 @@ sub sessions_with_order() {
sub urpmi_add_all_media {
my ($in) = @_;
+ #- configure urpmi media if network is up
+ require network::tools;
return if !network::tools::has_network_connection();
my $_wait = $in->wait_message(N("Please wait"), N("Please wait, adding media..."));
run_program::rooted($::prefix, 'urpmi.addmedia', '--distrib', '--mirrorlist', '$MIRRORLIST');
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index f2b8c058f..662bcc60d 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -88,8 +88,7 @@ sub ask_network() {
}
sub ask_urpmi() {
- #- configure urpmi media if network is up and no media are configured
- require network::tools;
+ #- configure urpmi media if no media are configured
run_program::get_stdout('urpmq', '--list-media') and return;
any::urpmi_add_all_media($in);
}