From b0c38d2b22823e77b9db4cae26464f7bc3c216c7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 28 Jan 2001 23:34:31 +0000
Subject: (get_autologin): adapt to new format of sysconfig/desktop

---
 perl-install/any.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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 {
-- 
cgit v1.2.1