diff options
Diffstat (limited to 'perl-install/standalone/finish-install')
| -rwxr-xr-x | perl-install/standalone/finish-install | 177 |
1 files changed, 141 insertions, 36 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index 8579cfc67..81a2f00e5 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -6,15 +6,13 @@ use lib qw(/usr/lib/libDrakX); BEGIN { unshift @::textdomains, 'drakx-net', 'drakx-kbd-mouse-x11', 'drak3d' } use standalone; -$::isStandalone = 0; - use common; use interactive; use any; use authentication; use network::network; -use network::netconnect; use security::level; +use messages; my $conf_file = '/etc/sysconfig/finish-install'; my %conf = getVarsFromSh($conf_file); @@ -22,19 +20,35 @@ my $authentication = authentication::get(); my $security = security::level::get(); my $net = {}; my $locale; +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 { + my ($name) = @_; + $conf{lc($name)} || $conf{uc($name)}; +} sub ask_license() { + local $::isWizard = 0; any::acceptLicense($in); } sub ask_language() { require lang; $locale = lang::read(); - any::selectLanguage_and_more_standalone($in, $locale); + my ($lang) = cat_("/proc/cmdline") =~ /\blang=(.+?)\b/; + my $h = lang::lang_to_ourlocale($lang); + if ($lang && member($h->{lang}, lang::list_langs(exclude_non_installed => 1))) { + put_in_hash($locale, $h); + lang::set($locale); + } + any::selectLanguage_standalone($in, $locale); lang::write_and_install($locale, $in->do_pkgs); } @@ -44,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; @@ -54,65 +68,152 @@ sub ask_keyboard() { keyboard::configure_and_set_standalone($keyboard); } +#- TIMEZONE=simplified: do not ask timezone and make ntp settings advanced sub ask_timezone() { require timezone; - my $t = timezone::read(); - $t->{timezone} = timezone::bestTimezone($locale->{country}) if $locale->{country}; - any::configure_timezone($in, $t, 'ask_gmt'); - timezone::write($t); + $timezone = timezone::read(); + $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('chrony') if $timezone->{ntp}; + timezone::write($timezone); + #- reload sys clock from hc once we know the real timezone - timezone::reload_sys_clock($t); + timezone::reload_sys_clock($timezone); +} + +#- COUNTRY=simplified: guess the country from timezone, do not ask +sub ask_country() { + require lang; + $locale ||= lang::read(); + require Time::ZoneInfo; + my $zones = Time::ZoneInfo->new; + if ($timezone && $zones) { + #- guess only if timezone has been asked already + if (my $zone = $zones->current_zone) { + if (my $country_code = $zones->country($zone)) { + $locale->{country} = $country_code; + } + } + } + any::selectCountry($in, $locale) if lc(get_conf('COUNTRY')) ne 'simplified'; + lang::write_and_install($locale, $in->do_pkgs); } sub ask_network() { - my $modules_conf = modules::any_conf->read; + require network::tools; + require services; + return if network::tools::has_network_connection(); + + #- test again connection after waiting for network up + my $w = $in->wait_message(N("Please wait"), N("Testing your connection...")); + 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(); + require network::netconnect; + my $modules_conf = modules::any_conf->read; network::netconnect::real_main($net, $in, $modules_conf); + $modules_conf->write; } -sub ask_authentication() { - my $meta_class = { getVarsFromSh("/etc/sysconfig/system") }->{META_CLASS}; +sub ask_urpmi() { + #- 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); +} - my $superuser = {}; - authentication::ask_root_password_and_authentication($in, $net, $superuser, $authentication, $meta_class, $security); +sub set_authentication { + my ($superuser) = @_; authentication::set_root_passwd($superuser, $authentication); - - eval { - authentication::set($in, $net, $authentication) or goto &ask_authentication; + my $ok = eval { + authentication::set($in, $net, $authentication) or return; network::network::write_network_conf($net); + 1; }; - if (my $err = $@) { - $in->ask_warn(N("Error"), formatError($err)); - goto &ask_authentication; - } + $in->ask_warn(N("Error"), formatError($@)) if $@; + return $ok; } +sub ask_authentication() { + my $meta_class = { getVarsFromSh("/etc/sysconfig/system") }->{META_CLASS}; + my $superuser = {}; + authentication::ask_root_password_and_authentication($in, $net, $superuser, $authentication, $meta_class, $security); + set_authentication($superuser) or goto &ask_authentication; +} + +#- USERS=with_root: asks both root and user accounts +#- USER_RENAME_FROM=<old user>: create the new user by renaming <old user> +#- USER_AUTOLOGIN_FIRST: configure autologin for the first added user sub ask_users() { - my $users = []; - any::ask_user($in, $users, $security); - my $old_user = $conf{USER_RENAME_FROM}; - my $old_autologin; + my $users = []; + my $superuser = to_bool(lc(get_conf('USERS')) eq 'with_root') && {}; + any::ask_user_and_root($in, $superuser, $users, $security); + my $old_user = get_conf('USER_RENAME_FROM'); if (@$users && $old_user) { $users->[0]{rename_from} = $old_user; $users->[0]{home} ||= '/home/' . $users->[0]{name}; } my $autologin = any::get_autologin(); - $autologin_first = ($autologin->{autologin} eq $old_user || $conf{USER_AUTOLOGIN_FIRST} eq "yes") && $autologin->{desktop}; + my $autologin_first = ($autologin->{user} eq $old_user || lc(get_conf('USER_AUTOLOGIN_FIRST')) eq "yes") && $autologin->{desktop}; + if ($superuser) { + set_authentication($superuser) or goto &ask_users; + } any::add_users($users, $authentication); - any::set_autologin($in->do_pkgs, $users->[0]{name}, $autologin_first) - if $autologin_first; + if ($autologin_first) { + $autologin->{user} = $users->[0]{name}; + $autologin->{desktop} = $autologin_first; + any::set_autologin($in->do_pkgs, $autologin); + } + my $finit_conf = "/etc/finit.conf"; + substInFile { + s/^user .*//; + $_ .= "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/$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 . "/" . $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; + } + } + } } sub ask_glx() { require Xconfig::glx; - my $glx = Xconfig::glx::detect_may_install($in); - if ($glx->{supported} && Xconfig::glx::choose_interactive($in, $glx)) { + my @installed_types = Xconfig::glx::filter_installed_types(\@Xconfig::glx::gl_compositing_types); + any { $_->{type} ne "none" } @installed_types or return; + my $glx = Xconfig::glx::detect_may_install($in->do_pkgs); + if ($glx->{supported} && Xconfig::glx::choose_interactive($in, $glx, 'installed_only')) { Xconfig::glx::write($glx); } } sub ask_encrypt_home() { - my $user = { name => $conf{ENCRYPT_HOME_USER}, device => $conf{ENCRYPT_HOME_DEVICE} }; + my $user = { name => get_conf('ENCRYPT_HOME_USER'), device => get_conf('ENCRYPT_HOME_DEVICE') }; any { !defined $_ } values %$user and return; $in->ask_from(N("Encrypted home partition"), N("Please enter a password for the %s user", $user->{name}), [ @@ -123,7 +224,7 @@ sub ask_encrypt_home() { authentication::check_given_password($in, $user, 6) or return 1,0; return 0; }); - authentication::write_passwd_user($user); + authentication::write_passwd_user($user, $authentication); encrypt_home($user); } @@ -138,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 }, @@ -169,12 +271,13 @@ sub encrypt_home { run_program::rooted($::prefix, 'umount', $home); run_program::rooted($::prefix, 'cryptsetup', 'luksClose', $user->{name}); + undef $wait; } sub call { my ($step_name) = @_; my $f_name = 'ask_' . $step_name; - if (member('no', map { lc($conf{$_}) } lc($step_name), uc($step_name))) { + if (lc(get_conf($step_name)) eq 'no') { log::l("ignoring $f_name"); } else { log::l("calling $f_name"); @@ -188,13 +291,15 @@ call('language'); call('license'); # "Previous" button isn't functiunnal and acts like "next" (#25349) $::Wizard_no_previous = 1; -call('keyboard'); call('timezone'); +call('country'); +call('keyboard'); call('network'); if (defined $::WizardWindow) { $::WizardWindow->destroy; undef $::WizardWindow; } +call('urpmi'); $::Wizard_pix_up = 'redhat-config-users'; call('authentication'); call('users'); |