summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-09 15:59:13 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-09 15:59:13 +0000
commitf1b09507c7303487896fe3e9b37d3942989c669b (patch)
treeb35676e31c128cc134128572d5cac3daeac81727 /perl-install/any.pm
parent6d1aef46d744ff083f4c992e184d749b946a010c (diff)
downloaddrakx-f1b09507c7303487896fe3e9b37d3942989c669b.tar
drakx-f1b09507c7303487896fe3e9b37d3942989c669b.tar.gz
drakx-f1b09507c7303487896fe3e9b37d3942989c669b.tar.bz2
drakx-f1b09507c7303487896fe3e9b37d3942989c669b.tar.xz
drakx-f1b09507c7303487896fe3e9b37d3942989c669b.zip
abort autologin configuration if dm install fails
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm9
1 files changed, 6 insertions, 3 deletions
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');