From 8273f5c4c66a86d6da011915fa55fe4d201169a7 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Wed, 10 Sep 2003 11:47:10 +0000
Subject: add higher level explanations

---
 perl-install/standalone/drakedm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone/drakedm')

diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm
index 9106dd051..286437bf2 100644
--- a/perl-install/standalone/drakedm
+++ b/perl-install/standalone/drakedm
@@ -35,12 +35,17 @@ my %dm = ('GNOME' => [ 'GDM (GNOME Display Manager)', '/usr/bin/gdm', 'gdm' ],
           'XDM'   => [ 'XDM (X Display Manager)', '/usr/bin/X11/xdm', 'XFree86' ],
           );
 
-my $dm = 'KDE';
+my $dm;
 
 foreach (cat_($cfg_file)) {
     $dm = uc($1) if /^DISPLAYMANAGER=(.*)$/; 
 }
 
+if (!$dm) {
+    $dm = 'KDE';
+    log::explanations("defaulting to $dm for display manager")
+}
+
 my @raw_list = sort keys %dm;
 my @list = $::expert ? @raw_list : (grep { -e $dm{$_}->[1] } @raw_list) or @raw_list;
 
@@ -67,6 +72,7 @@ several different X sessions on your local machine at the same time.")),
         s/^\n//g;
         $_ .= "\nDISPLAYMANAGER=$dm\n" if eof;
     } $cfg_file;
+    log::explanations("display manager is now $dm");
     if (any::running_window_manager()) {
         $in->ask_okcancel('', N("The change is done, do you want to restart the dm service ?"), 1) and services::restart("dm");
     }
-- 
cgit v1.2.1