From 49da0edfe4e11c357d99a157aa739c275da71b34 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Sep 2009 17:20:18 +0000
Subject: always ensure dm is installed before configuring autologin/desktop

---
 perl-install/any.pm           | 6 +++++-
 perl-install/install/steps.pm | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5cf721578..db662f1ae 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -675,6 +675,11 @@ sub set_autologin {
     log::l("set_autologin $autologin->{user} $autologin->{desktop}");
     my $do_autologin = bool2text($autologin->{user});
 
+    $autologin->{dm} || = 'xdm';
+    $do_pkgs->ensure_is_installed($autologin->{dm});
+    $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
+      if $autologin->{user} && $autologin->{dm} eq 'xdm';
+
     #- Configure KDM / MDKKDM
     eval { common::update_gnomekderc_no_create(common::read_alternative('kdm4-config'), 'X-:0-Core' => (
 	AutoLoginEnable => $do_autologin,
@@ -691,7 +696,6 @@ sub set_autologin {
     if (member($autologin->{desktop}, 'KDE', 'KDE4', 'GNOME')) {
 	unlink $xdm_autologin_cfg;
     } else {
-	$do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin') if $autologin->{user};
 	setVarsInShMode($xdm_autologin_cfg, 0644,
 			{ USER => $autologin->{user}, AUTOLOGIN => bool2yesno($autologin->{user}), EXEC => '/usr/bin/startx.autologin' });
     }
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 8ad398c4c..bec45310a 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -724,9 +724,6 @@ sub addUser {
     my $autologin = any::get_autologin();
     $autologin->{user} = $o->{autologin};
     $autologin->{desktop} = $o->{desktop} if $o->{desktop};
-    if ($autologin->{user}) {
-	$o->pkg_install("autologin") if !member($autologin->{desktop}, 'KDE', 'KDE4', 'GNOME');
-    }
     any::set_autologin($o->do_pkgs, $autologin);
 
     install::any::disable_user_view() if @$users == ();
-- 
cgit v1.2.1