From 29a53d75292a01f432525b22ef4952b89b6b3501 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 13 Oct 2009 17:49:11 +0000
Subject: do not attempt to configure autologin if CAT_X is not selected

---
 perl-install/install/steps.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'perl-install/install/steps.pm')

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 5123e3bdc..5ee5a5640 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -715,11 +715,13 @@ sub addUser {
 
     any::add_users($users, $o->{authentication});
 
-    my $autologin = any::get_autologin();
-    $autologin->{user} = $o->{autologin};
-    $autologin->{desktop} = $o->{desktop} if $o->{desktop};
-    $autologin->{dm} = $o->{dm} if $o->{dm};
-    any::set_autologin($o->do_pkgs, $autologin);
+    if ($o->{rpmsrate_flags_chosen}{CAT_X}) {
+        my $autologin = any::get_autologin();
+        $autologin->{user} = $o->{autologin};
+        $autologin->{desktop} = $o->{desktop} if $o->{desktop};
+        $autologin->{dm} = $o->{dm} if $o->{dm};
+        any::set_autologin($o->do_pkgs, $autologin);
+    }
 
     install::any::disable_user_view() if @$users == ();
 }
-- 
cgit v1.2.1