diff options
Diffstat (limited to 'perl-install/standalone/finish-install')
| -rwxr-xr-x | perl-install/standalone/finish-install | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index fc91491cd..16de321ea 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -58,7 +58,7 @@ sub ask_keyboard() { choose: $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"), - N("Please, choose your keyboard layout."), + N("Please choose your keyboard layout."), sub { translate(keyboard::KEYBOARD2text($_[0])) }, [ keyboard::KEYBOARDs() ], $keyboard->{KEYBOARD}) or return; @@ -75,7 +75,7 @@ sub ask_timezone() { $timezone->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country}; any::configure_timezone($in, $timezone, 'ask_gmt', lc(get_conf('TIMEZONE')) eq 'simplified'); - $in->do_pkgs->ensure_is_installed('ntp') if $timezone->{ntp}; + $in->do_pkgs->ensure_is_installed('chrony') if $timezone->{ntp}; timezone::write($timezone); #- reload sys clock from hc once we know the real timezone @@ -102,6 +102,7 @@ sub ask_country() { sub ask_network() { require network::tools; + require services; return if network::tools::has_network_connection(); #- test again connection after waiting for network-up service @@ -117,8 +118,10 @@ sub ask_network() { } sub ask_urpmi() { - #- configure urpmi media if no media are configured - run_program::get_stdout('urpmq', '--list-media') and return; + #- configure urpmi media if no online media are configured + my @media_url = map { top(split(' ', $_)) } run_program::get_stdout('urpmq', '--list-url'); + my @online_media = grep { !m,^(?:file://)?/, } @media_url; + @online_media and return; any::urpmi_add_all_media($in); } |