diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-09-23 16:42:33 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-09-23 16:42:33 +0000 |
| commit | 7aee3050d36d72c486bd8b32b68b96b73e3d4281 (patch) | |
| tree | ecae39295e1aca509d9d1bb8de0c377cff6f820b /perl-install | |
| parent | 8d2993a3928f8637b8940b9ad23c59517204e4ad (diff) | |
| download | drakx-7aee3050d36d72c486bd8b32b68b96b73e3d4281.tar drakx-7aee3050d36d72c486bd8b32b68b96b73e3d4281.tar.gz drakx-7aee3050d36d72c486bd8b32b68b96b73e3d4281.tar.bz2 drakx-7aee3050d36d72c486bd8b32b68b96b73e3d4281.tar.xz drakx-7aee3050d36d72c486bd8b32b68b96b73e3d4281.zip | |
read autologin settings from /etc/sysconfig/autologin as fallback
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 5 |
1 files changed, 5 insertions, 0 deletions
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 }; } |