From 34723518535dbc9e1dd3e7135cec1a66dc4dacae Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 6 Jan 2000 14:55:03 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps.pm             | 8 ++++++++
 perl-install/install_steps_interactive.pm | 3 ---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f628ff7fa..7d93a6bd6 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -242,6 +242,14 @@ sub afterInstallPackages($) {
     #- remove the nasty acon...
     run_program::rooted($o->{prefix}, "chkconfig", "--del", "acon") unless $ENV{LANGUAGE} =~ /ar/;
 
+    #- create /etc/sysconfig/desktop file according to user choice and presence of /usr/bin/kdm or /usr/bin/gdm.
+    my $f = "$o->{prefix}/etc/sysconfig/desktop";
+    if ($o->{compssUsersChoice}{KDE} && -x "$o->{prefix}/usr/bin/kdm") {
+	output($f, "KDE\n");
+    } elsif ($o->{compssUsersChoice}{Gnome} && -x "$o->{prefix}/usr/bin/gdm") {
+	output($f, "GNOME\n");
+    }
+
     if ($o->{pcmcia}) {
 	substInFile { s/.*(TaskBarShowAPMStatus).*/$1=1/ } "$o->{prefix}/usr/lib/X11/icewm/preferences";
 	eval { commands::cp("$o->{prefix}/usr/share/applnk/System/kapm.kdelnk", 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 8807e0a6a..6878b828e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -301,9 +301,6 @@ sub chooseGroups {
 	    delete $_->{skip};
 	}
     }
-    my $f = "$o->{prefix}/etc/sysconfig/desktop";
-    output($f, "GNOME\n") if $o->{compssUsersChoice}{Gnome};
-    output($f, "KDE\n") if $o->{compssUsersChoice}{KDE};
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1