diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-05-01 20:40:49 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-05-01 20:40:49 +0000 |
| commit | ca3f1a560aa7b8ce22bfb4b23b9202b14ff84b9e (patch) | |
| tree | abd12a13ee7ba55b5a7556d1b1aefef08dc17aad | |
| parent | cc61ab09296a7f8e8a3d6914e85e1a52d2649eb5 (diff) | |
| download | drakx-backup-do-not-use-ca3f1a560aa7b8ce22bfb4b23b9202b14ff84b9e.tar drakx-backup-do-not-use-ca3f1a560aa7b8ce22bfb4b23b9202b14ff84b9e.tar.gz drakx-backup-do-not-use-ca3f1a560aa7b8ce22bfb4b23b9202b14ff84b9e.tar.bz2 drakx-backup-do-not-use-ca3f1a560aa7b8ce22bfb4b23b9202b14ff84b9e.tar.xz drakx-backup-do-not-use-ca3f1a560aa7b8ce22bfb4b23b9202b14ff84b9e.zip | |
make xdm installation automatic in auto_inst mode (mga#9875)
| -rw-r--r-- | perl-install/any.pm | 6 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index eb7b86e06..33afd1743 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -705,15 +705,15 @@ sub is_standalone_autologin_needed { } sub set_autologin { - my ($do_pkgs, $autologin) = @_; + my ($do_pkgs, $autologin, $o_auto) = @_; log::l("set_autologin $autologin->{user} $autologin->{desktop}"); my $do_autologin = bool2text($autologin->{user}); $autologin->{dm} ||= 'xdm'; - $do_pkgs->ensure_is_installed($autologin->{dm}) + $do_pkgs->ensure_is_installed($autologin->{dm}, undef, $o_auto) or return; if ($autologin->{user} && is_standalone_autologin_needed($autologin->{dm})) { - $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin') + $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin', $o_auto) or return; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a3c0ee35e..700d99e30 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - include mount options in auto_inst.pl +- make xdm installation automatic in auto_inst mode (mga#9875) Version 15.47 - 30 April 2013 diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 54f322632..c1c4d445c 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -745,7 +745,7 @@ sub addUser { $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); + any::set_autologin($o->do_pkgs, $autologin, $o->{step}{auto}); } install::any::disable_user_view() if @$users == (); |