summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-13 17:49:11 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-13 17:49:11 +0000
commit29a53d75292a01f432525b22ef4952b89b6b3501 (patch)
tree52aa3866d85cbbbdbc1006f414cc2c9ae5ae601c /perl-install/install
parent80fdaef633577701711c37ea465b88858aea9247 (diff)
downloaddrakx-29a53d75292a01f432525b22ef4952b89b6b3501.tar
drakx-29a53d75292a01f432525b22ef4952b89b6b3501.tar.gz
drakx-29a53d75292a01f432525b22ef4952b89b6b3501.tar.bz2
drakx-29a53d75292a01f432525b22ef4952b89b6b3501.tar.xz
drakx-29a53d75292a01f432525b22ef4952b89b6b3501.zip
do not attempt to configure autologin if CAT_X is not selected
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps.pm12
2 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8aa4449ce..8781bd986 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -2,6 +2,7 @@
- partitioning wizard:
o allow using existing partition on all disks (#54478)
- make sure suggests are disabled in truly minimal install
+- do not attempt to configure autologin if CAT_X is not selected
Version 12.64 - 12 October 2009
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 5123e3bdc..5ee5a5640 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -715,11 +715,13 @@ sub addUser {
any::add_users($users, $o->{authentication});
- my $autologin = any::get_autologin();
- $autologin->{user} = $o->{autologin};
- $autologin->{desktop} = $o->{desktop} if $o->{desktop};
- $autologin->{dm} = $o->{dm} if $o->{dm};
- any::set_autologin($o->do_pkgs, $autologin);
+ if ($o->{rpmsrate_flags_chosen}{CAT_X}) {
+ my $autologin = any::get_autologin();
+ $autologin->{user} = $o->{autologin};
+ $autologin->{desktop} = $o->{desktop} if $o->{desktop};
+ $autologin->{dm} = $o->{dm} if $o->{dm};
+ any::set_autologin($o->do_pkgs, $autologin);
+ }
install::any::disable_user_view() if @$users == ();
}