summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-09-10 11:47:10 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-09-10 11:47:10 +0000
commit8273f5c4c66a86d6da011915fa55fe4d201169a7 (patch)
tree57ad38e8922dcfd4a5ebf2fce84dfa07228a5db6
parent3d9e279f9afd33decdb6430d1c1042e784299343 (diff)
downloaddrakx-backup-do-not-use-8273f5c4c66a86d6da011915fa55fe4d201169a7.tar
drakx-backup-do-not-use-8273f5c4c66a86d6da011915fa55fe4d201169a7.tar.gz
drakx-backup-do-not-use-8273f5c4c66a86d6da011915fa55fe4d201169a7.tar.bz2
drakx-backup-do-not-use-8273f5c4c66a86d6da011915fa55fe4d201169a7.tar.xz
drakx-backup-do-not-use-8273f5c4c66a86d6da011915fa55fe4d201169a7.zip
add higher level explanations
-rw-r--r--perl-install/standalone/drakedm8
1 files changed, 7 insertions, 1 deletions
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");
}