summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-13 18:00:28 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-13 18:00:28 +0000
commit3f111a42fbf42fb2b2c4f5a81b97d4589040b5be (patch)
tree415dca527dab29527d1f165b53cc9f3414a59142
parent16ac82e2724236a778c0eae6275e84008f9e2083 (diff)
downloaddrakx-3f111a42fbf42fb2b2c4f5a81b97d4589040b5be.tar
drakx-3f111a42fbf42fb2b2c4f5a81b97d4589040b5be.tar.gz
drakx-3f111a42fbf42fb2b2c4f5a81b97d4589040b5be.tar.bz2
drakx-3f111a42fbf42fb2b2c4f5a81b97d4589040b5be.tar.xz
drakx-3f111a42fbf42fb2b2c4f5a81b97d4589040b5be.zip
use autologin_file variable
-rw-r--r--perl-install/any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 14b0d4009..4b3efb20e 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -639,7 +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 $autologin_file = "$::prefix/etc/sysconfig/autologin";
my $desktop = $desktop{DESKTOP} || first(sessions());
my %desktop_to_dm = (
GNOME => 'gdm',
@@ -665,7 +665,7 @@ sub get_autologin() {
my %conf = read_gnomekderc($kdm_file, 'X-:0-Core');
$autologin_user = text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser};
} else {
- my %conf = getVarsFromSh("$::prefix/etc/sysconfig/autologin");
+ my %conf = getVarsFromSh($autologin_file);
$autologin_user = text2bool($conf{AUTOLOGIN}) && $conf{USER};
}