summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm9
-rw-r--r--perl-install/install/NEWS1
3 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5db160349..4cba1c9db 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- autologin/desktop configuration (shared code):
o fix guessing dm name from lookupdm
+ o abort configuration if dm install fails
Version 12.61 - 8 October 2009
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 89ccdcd6b..98e3c0d56 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -678,9 +678,12 @@ sub set_autologin {
my $do_autologin = bool2text($autologin->{user});
$autologin->{dm} ||= 'xdm';
- $do_pkgs->ensure_is_installed($autologin->{dm});
- $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
- if $autologin->{user} && $autologin->{dm} eq 'xdm';
+ $do_pkgs->ensure_is_installed($autologin->{dm})
+ or return;
+ if ($autologin->{user} && $autologin->{dm} eq 'xdm') {
+ $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
+ or return;
+ }
#- Configure KDM / MDKKDM
my $kdm_conffile = common::read_alternative('kdm4-config');
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 36e0e0bad..f473174a6 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- autologin/desktop configuration (shared code):
o fix guessing dm name from lookupdm
+ o abort configuration if dm install fails
Version 12.61 - 8 October 2009