1 files changed, 36 insertions, 9 deletions

diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 9264436ad..81a2f00e5 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -12,6 +12,7 @@ use any;
 use authentication;
 use network::network;
 use security::level;
+use messages;
 
 my $conf_file = '/etc/sysconfig/finish-install';
 my %conf = getVarsFromSh($conf_file);
@@ -23,7 +24,9 @@ my $timezone;
 network::network::read_net_conf($net);
 
 $::isWizard = 1;
-my $in = 'interactive'->vnew;
+my $in = 'interactive'->vnew('su');
+$in->{untranslated_license} = messages::main_license_raw();
+
 any::set_wm_hints_if_needed($in);
 
 sub get_conf {
@@ -55,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;
@@ -72,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
@@ -99,11 +102,20 @@ 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
+    #- test again connection after waiting for network up
     my $w = $in->wait_message(N("Please wait"), N("Testing your connection..."));
-    services::start('network-up');
+    if (services::starts_on_boot('NetworkManager')) {
+        my $time = 0;
+        while ($time < 20 && run_program::get_stdout('systemctl show -p SubState NetworkManager-wait-online') =~ /start/) {
+            $time++;
+            sleep(1);
+        }
+    } else {
+        services::start('network-up');
+    }
     undef $w;
     return if network::tools::has_network_connection();
 
@@ -114,8 +126,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);
 }
 
@@ -167,13 +181,24 @@ sub ask_users() {
         $_ .= "user $users->[0]{name}\n" if eof;
     } $finit_conf if -e $finit_conf;
     if ($old_user) {
+        my $new_user = $users->[0]{name};
         #- replace home path in user config files
         my $old_home = "/home/$old_user";
-        my $new_home = "/home/$users->[0]{name}";
+        my $new_home = "/home/$new_user";
         run_program::run(qq(grep -D skip -rl $old_home $new_home/.??* | while read f; do perl -pi -e 's,$old_home,$new_home,g' "\$f"; done));
         #- give console rights for current session
         my $console_dir = "/var/run/console";
-        cp_f($console_dir . "/" . $old_user, $console_dir . "/" . $users->[0]{name}) if -e $console_dir . "/" . $old_user;
+        cp_f($console_dir . "/" . $old_user, $console_dir . "/" . $new_user) if -e $console_dir . "/" . $old_user;
+        #- update user name in network configurations
+        #- for now, only support the case of a single user name
+        require services;
+        my $using_networkmanager = services::is_service_running('NetworkManager');
+        foreach my $f (glob('/etc/sysconfig/network-scripts/ifcfg-*')) {
+            if (cat_($f) =~ /\nUSERS=$old_user\n/) {
+                run_program::run('perl', '-pi', '-e', "s,^USERS=$old_user,USERS=$new_user,", $f);
+                run_program::run('nmcli', 'con', 'load', $f) if $using_networkmanager;
+            }
+        }
     }
 }
 
@@ -214,6 +239,7 @@ sub encrypt_home {
         s/^volume $user->{name}.*//;
         $_ .= "volume $user->{name} crypt - $device $home - - -\n" if eof;
     } $::prefix . '/etc/security/pam_mount.conf';
+
     authentication::set_pam_authentication('mount');
 
     run_program::raw({ root => $::prefix, sensitive_arguments => 1 },
@@ -245,6 +271,7 @@ sub encrypt_home {
 
     run_program::rooted($::prefix, 'umount', $home);
     run_program::rooted($::prefix, 'cryptsetup', 'luksClose', $user->{name});
+    undef $wait;
 }
 
 sub call {