summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-09 15:49:53 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-09 15:49:53 +0000
commit6d1aef46d744ff083f4c992e184d749b946a010c (patch)
treeab53217e32fcecc3d205e41828750d8c6e187007 /perl-install
parentca918a273d4d1333a3520e28327bac73f01986fb (diff)
downloaddrakx-6d1aef46d744ff083f4c992e184d749b946a010c.tar
drakx-6d1aef46d744ff083f4c992e184d749b946a010c.tar.gz
drakx-6d1aef46d744ff083f4c992e184d749b946a010c.tar.bz2
drakx-6d1aef46d744ff083f4c992e184d749b946a010c.tar.xz
drakx-6d1aef46d744ff083f4c992e184d749b946a010c.zip
fix guessing dm name from lookupdm
Diffstat (limited to 'perl-install')
-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: