summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-02 17:38:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-02 17:38:42 +0000
commit78dcad1b7089103e30ede8bb815ddc92b9f68578 (patch)
treef5714a13dda40b38501ed67e0e9654380d3e435f
parente7efea7650c800f2e61a9de2bdd0dac5c8e2c217 (diff)
downloaddrakx-78dcad1b7089103e30ede8bb815ddc92b9f68578.tar
drakx-78dcad1b7089103e30ede8bb815ddc92b9f68578.tar.gz
drakx-78dcad1b7089103e30ede8bb815ddc92b9f68578.tar.bz2
drakx-78dcad1b7089103e30ede8bb815ddc92b9f68578.tar.xz
drakx-78dcad1b7089103e30ede8bb815ddc92b9f68578.zip
(get_autologin): $o->{autologin} is set to the chosen user only if AUTOLOGIN is set (it now mirrors what set_autologin() does)
-rw-r--r--perl-install/any.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index b61cb2849..9d703befe 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -360,7 +360,7 @@ sub pack_passwd {
sub get_autologin {
my ($prefix, $o) = @_;
my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
- $o->{autologin} ||= $l{USER};
+ $o->{autologin} ||= text2bool($l{AUTOLOGIN}) && $l{USER};
%l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
$o->{desktop} ||= $l{DESKTOP};
}