diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-09-23 16:36:02 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-09-23 16:36:02 +0000 |
| commit | c7a6fd639fff984e6a0fd98cd8e357056027327b (patch) | |
| tree | f8fa77115420cf83022b491a3d3af7acb7dc182f /perl-install/any.pm | |
| parent | a63798bd8a60df9a840d898144899dba37c37344 (diff) | |
| download | drakx-backup-do-not-use-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar drakx-backup-do-not-use-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar.gz drakx-backup-do-not-use-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar.bz2 drakx-backup-do-not-use-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar.xz drakx-backup-do-not-use-c7a6fd639fff984e6a0fd98cd8e357056027327b.zip | |
simplify
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index b9418dd21..fa3d9137d 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -653,16 +653,16 @@ sub get_autologin() { $desktop_to_dm{$desktop} || chomp_(run_program::rooted_get_stdout("/etc/X11/lookupdm")); $dm = $dm_canonical{$dm} if exists $dm_canonical{$dm}; - my $autologin = do { - if ($dm eq "gdm") { - my %conf = read_gnomekderc($gdm_file, 'daemon'); - text2bool($conf{AutomaticLoginEnable}) && $conf{AutomaticLogin}; - } else { # KDM / MdkKDM - my %conf = read_gnomekderc($kdm_file, 'X-:0-Core'); - text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser}; - } - }; - { autologin => $autologin, desktop => $desktop }; + + my $autologin_user; + if ($dm eq "gdm") { + my %conf = read_gnomekderc($gdm_file, 'daemon'); + $autologin_user = text2bool($conf{AutomaticLoginEnable}) && $conf{AutomaticLogin}; + } else { # KDM / MdkKDM + my %conf = read_gnomekderc($kdm_file, 'X-:0-Core'); + $autologin_user = text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser}; + } + { autologin => $autologin_user, desktop => $desktop }; } sub set_autologin { |