diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-04-03 04:27:49 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-04-03 04:27:49 +0000 |
| commit | 219d1feb17c97f56317bdffa4ecb6720026870d9 (patch) | |
| tree | f14a3b83f64dabed91de8ad1c6b8d385ce492f7e | |
| parent | 40c32e3cf8cc20d9d3a582de5685efc525ae67f7 (diff) | |
| download | drakx-backup-do-not-use-219d1feb17c97f56317bdffa4ecb6720026870d9.tar drakx-backup-do-not-use-219d1feb17c97f56317bdffa4ecb6720026870d9.tar.gz drakx-backup-do-not-use-219d1feb17c97f56317bdffa4ecb6720026870d9.tar.bz2 drakx-backup-do-not-use-219d1feb17c97f56317bdffa4ecb6720026870d9.tar.xz drakx-backup-do-not-use-219d1feb17c97f56317bdffa4ecb6720026870d9.zip | |
configure urpmi media if network is up and no media are configured (#38202)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 10 |
2 files changed, 13 insertions, 0 deletions
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'); |