summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-21 11:23:09 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-21 11:23:09 +0000
commit5af1b41dc19d56188da17eecfc1017fc98df0463 (patch)
tree311a3b821476efec637ce57c5c1a07b3206728e9
parent39db482833042f1ea4e669b802c9ae64b9361a93 (diff)
downloaddrakx-5af1b41dc19d56188da17eecfc1017fc98df0463.tar
drakx-5af1b41dc19d56188da17eecfc1017fc98df0463.tar.gz
drakx-5af1b41dc19d56188da17eecfc1017fc98df0463.tar.bz2
drakx-5af1b41dc19d56188da17eecfc1017fc98df0463.tar.xz
drakx-5af1b41dc19d56188da17eecfc1017fc98df0463.zip
finish-install: config first user to autologin if USER_AUTOLOGIN_FIRST is "yes"
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/finish-install8
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index cc88f8d4e..c5ca54703 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,7 @@
- finish-install:
o write autologin settings after user creation only
(so that home is set and exists, should partly fix GNOME autologin)
+ o config first user to autologin if USER_AUTOLOGIN_FIRST is "yes"
Version 10.4.207 - 21 September 2007, by Thierry Vignaud
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 8dd17fb6f..5a26090c2 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -92,12 +92,12 @@ sub ask_users() {
if (@$users && $old_user) {
$users->[0]{rename_from} = $old_user;
$users->[0]{home} ||= '/home/' . $users->[0]{name};
- my $autologin = any::get_autologin();
- $old_autologin = $autologin->{autologin} eq $old_user && $autologin->{desktop};
}
+ my $autologin = any::get_autologin();
+ $autologin_first = ($autologin->{autologin} eq $old_user || $conf{USER_AUTOLOGIN_FIRST} eq "yes") && $autologin->{desktop};
any::add_users($users, $authentication);
- any::set_autologin($in->do_pkgs, $users->[0]{name}, $old_autologin)
- if $old_autologin;
+ any::set_autologin($in->do_pkgs, $users->[0]{name}, $autologin_first)
+ if $autologin_first;
}
sub ask_glx() {