summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a13c411a9..5db160349 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- autologin/desktop configuration (shared code):
+ o fix guessing dm name from lookupdm
+
Version 12.61 - 8 October 2009
- partitionning_wizard:
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 1b6caa42a..89ccdcd6b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -654,7 +654,7 @@ sub get_autologin() {
my $dm =
lc($desktop{DISPLAYMANAGER}) ||
$desktop_to_dm{$desktop} ||
- chomp_(run_program::rooted_get_stdout($::prefix, "/etc/X11/lookupdm"));
+ basename(chomp_(run_program::rooted_get_stdout($::prefix, "/etc/X11/lookupdm"));
$dm = $dm_canonical{$dm} if exists $dm_canonical{$dm};
my $autologin_user;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a2ec4886d..36e0e0bad 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- autologin/desktop configuration (shared code):
+ o fix guessing dm name from lookupdm
+
Version 12.61 - 8 October 2009
- partitionning_wizard: