From 97495087142b69b51c6e4d5364656ffe888d87cb Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 4 Aug 2004 06:35:07 +0000
Subject: don't set /etc/sysconfig/desktop anymore, configure ~/.wmrc,
 ~/.gnome2/gdm and ~/.desktop instead

---
 perl-install/any.pm | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

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

diff --git a/perl-install/any.pm b/perl-install/any.pm
index ddd6379a7..736c58a5e 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -411,7 +411,7 @@ sub get_autologin() {
 }
 
 sub set_autologin {
-    my ($user, $desktop) = @_;
+    my ($user, $wm) = @_;
     my $autologin = bool2text($user);
 
     #- Configure KDM / MDKKDM
@@ -426,19 +426,36 @@ sub set_autologin {
 	AutomaticLogin => $user,
     )) };
   
-    if ($user) {
-	my %l = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
-	$l{DESKTOP} = $desktop;
-	setVarsInSh("$::prefix/etc/sysconfig/desktop", \%l);
-	log::l("cat $::prefix/etc/sysconfig/desktop ($desktop):\n", cat_("$::prefix/etc/sysconfig/desktop"));
-    }
     my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
-    if (member($desktop, 'KDE', 'GNOME')) {
+    if (member($wm, 'KDE', 'GNOME')) {
 	unlink $xdm_autologin_cfg;
     } else {
 	setVarsInShMode($xdm_autologin_cfg, 0644,
 			{ USER => $user, AUTOLOGIN => bool2yesno($user), EXEC => '/usr/X11R6/bin/startx.autologin' });
     }
+
+    if ($user) {
+	my $home = (getpwnam($user))[7];
+	set_window_manager($home, $wm);
+    }
+}
+sub set_window_manager {
+    my ($home, $wm) = @_;
+    my $p_home = "$::prefix$home";
+
+    #- for KDM
+    output("$p_home/.wmrc", "$wm\n");
+
+    #- for GDM
+    mkdir_p("$p_home/.gnome2");
+    update_gnomekderc("$p_home/.gnome2/gdm", 'session', last => $wm);
+
+    #- for startx
+    {
+	my %l = getVarsFromSh("$p_home/.desktop");
+	$l{DESKTOP} = $wm;
+	setVarsInSh("$p_home/.desktop", \%l);
+    }
 }
 
 sub rotate_log {
-- 
cgit v1.2.1