summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-28 23:34:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-28 23:34:31 +0000
commitb0c38d2b22823e77b9db4cae26464f7bc3c216c7 (patch)
treeba9ee1a6a2df483d4193adff4eea9a218795d33e
parenta6545c4f0492651acad6d4f77c3708855814f46f (diff)
downloaddrakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar.gz
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar.bz2
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.tar.xz
drakx-b0c38d2b22823e77b9db4cae26464f7bc3c216c7.zip
(get_autologin): adapt to new format of sysconfig/desktop
-rw-r--r--perl-install/any.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0bb1a6dd3..8bd76ea71 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -259,7 +259,8 @@ sub get_autologin {
my ($prefix, $o) = @_;
my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
$o->{autologin} ||= $l{USER};
- $o->{desktop} ||= map { chomp; $_ } cat_("$prefix/etc/sysconfig/desktop");
+ %l = getVarsFromSh("$prefix/etc/sysconfig/desktop");
+ $o->{desktop} ||= $l{DESKTOP};
}
sub set_autologin {