From 7aee3050d36d72c486bd8b32b68b96b73e3d4281 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 23 Sep 2009 16:42:33 +0000 Subject: read autologin settings from /etc/sysconfig/autologin as fallback --- perl-install/any.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/perl-install/any.pm b/perl-install/any.pm index ba9a5f3ac..14d69b6d8 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -639,6 +639,7 @@ sub get_autologin() { my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop"); my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf"; my $kdm_file = common::read_alternative('kdm4-config'); + my $autologin_file = "/etc/sysconfig/autologin"; my $desktop = $desktop{DESKTOP} || first(sessions()); my %desktop_to_dm = ( GNOME => 'gdm', @@ -661,7 +662,11 @@ sub get_autologin() { } elsif ($dm eq "kdm") { my %conf = read_gnomekderc($kdm_file, 'X-:0-Core'); $autologin_user = text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser}; + } else { + my %conf = getVarsFromSh("$::prefix/etc/sysconfig/autologin"); + $autologin_user = text2bool($conf{AUTOLOGIN}) && $conf{USER}; } + { autologin => $autologin_user, desktop => $desktop }; } -- cgit v1.2.1