summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/finish-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-21 11:21:44 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-21 11:21:44 +0000
commit39db482833042f1ea4e669b802c9ae64b9361a93 (patch)
tree7ad3d870969b3d08570ffcdef12e598548a427ad /perl-install/standalone/finish-install
parent02f06bfe6f0badfb3727abc32ea82e16241e8437 (diff)
downloaddrakx-backup-do-not-use-39db482833042f1ea4e669b802c9ae64b9361a93.tar
drakx-backup-do-not-use-39db482833042f1ea4e669b802c9ae64b9361a93.tar.gz
drakx-backup-do-not-use-39db482833042f1ea4e669b802c9ae64b9361a93.tar.bz2
drakx-backup-do-not-use-39db482833042f1ea4e669b802c9ae64b9361a93.tar.xz
drakx-backup-do-not-use-39db482833042f1ea4e669b802c9ae64b9361a93.zip
finish-install: write autologin settings after user creation only (so that home is set and exists, should partly fix GNOME autologin)
Diffstat (limited to 'perl-install/standalone/finish-install')
-rwxr-xr-xperl-install/standalone/finish-install5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 967bdacf6..8dd17fb6f 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -88,13 +88,16 @@ sub ask_users() {
my $users = [];
any::ask_user($in, $users, $security);
my $old_user = $conf{USER_RENAME_FROM};
+ my $old_autologin;
if (@$users && $old_user) {
$users->[0]{rename_from} = $old_user;
$users->[0]{home} ||= '/home/' . $users->[0]{name};
my $autologin = any::get_autologin();
- $autologin->{autologin} eq $old_user and any::set_autologin($in->do_pkgs, $users->[0]{name}, $autologin->{desktop});
+ $old_autologin = $autologin->{autologin} eq $old_user && $autologin->{desktop};
}
any::add_users($users, $authentication);
+ any::set_autologin($in->do_pkgs, $users->[0]{name}, $old_autologin)
+ if $old_autologin;
}
sub ask_glx() {