From 219d1feb17c97f56317bdffa4ecb6720026870d9 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 3 Apr 2008 04:27:49 +0000
Subject: configure urpmi media if network is up and no media are configured
 (#38202)

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

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5873bbb77..c901d3797 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,9 @@
     (#38116), it is now handled in MDK::Common (see #34279)
 - draksplash:
   o do not write decimal values in theme config (#38271)
+- finish-install:
+  o configure urpmi media if network is up and no media are configured
+    (#38202)
 
 Version 10.25 - 1 April 2008
 
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index ee8ca04f4..b269dd110 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -83,6 +83,15 @@ sub ask_network() {
     $modules_conf->write;
 }
 
+sub ask_urpmi() {
+    #- configure urpmi media if network is up and no media are configured
+    require network::tools;
+    return if !network::tools::has_network_connection();
+    run_program::get_stdout('urpmq', '--list-media') and return;
+    my $_wait = $in->wait_message(N("Please wait"), N("Please wait, adding media..."));
+    run_program::run('urpmi.addmedia', '--distrib', '--mirrorlist', '$MIRRORLIST');
+}
+
 sub set_authentication {
     my ($superuser) = @_;
     authentication::set_root_passwd($superuser, $authentication);
@@ -222,6 +231,7 @@ if (defined $::WizardWindow) {
     $::WizardWindow->destroy;
     undef $::WizardWindow;
 }
+call('urpmi');
 $::Wizard_pix_up = 'redhat-config-users';
 call('authentication');
 call('users');
-- 
cgit v1.2.1