Mageia Bugzilla – Attachment 6536 Details for
Bug 8819
Add default sources at the end of the installation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
ask to set up network if !already done (untested) (v2)
8819b.diff (text/plain), 788 bytes, created by
Thierry Vignaud
on 2015-05-13 20:54:25 CEST
(
hide
)
Description:
ask to set up network if !already done (untested) (v2)
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2015-05-13 20:54:25 CEST
Size:
788 bytes
patch
obsolete
>diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm >index 3bbfb26..57cf4be 100644 >--- a/perl-install/install/steps_interactive.pm >+++ b/perl-install/install/steps_interactive.pm >@@ -728,7 +728,15 @@ sub installUpdates { > my ($o) = @_; > $o->{updates} ||= {}; > >- $o->hasNetwork or return; >+ if (!$o->hasNetwork) { >+ if ($o->ask_yesorno('', >+ join("\n", >+ N("A network connection is needed to enable update media."), >+ N("Do you want to configure the network now?")))) { >+ require network::netconnect; >+ network::netconnect::real_main($o->{net}, $o, $o->{modules_conf}); >+ } >+ } > > if (install::any::is_network_install($o) && > find { $_->{update} } install::media::allMediums($o->{packages})) {
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 3bbfb26..57cf4be 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -728,7 +728,15 @@ sub installUpdates { my ($o) = @_; $o->{updates} ||= {}; - $o->hasNetwork or return; + if (!$o->hasNetwork) { + if ($o->ask_yesorno('', + join("\n", + N("A network connection is needed to enable update media."), + N("Do you want to configure the network now?")))) { + require network::netconnect; + network::netconnect::real_main($o->{net}, $o, $o->{modules_conf}); + } + } if (install::any::is_network_install($o) && find { $_->{update} } install::media::allMediums($o->{packages})) {
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 8819
:
6534
|
6535
|
6536
|
6547
|
6566
|
6579
|
6586
|
6587
|
6601
|
6638