diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-13 10:35:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-13 10:35:15 +0000 |
| commit | 03af5cea74c7c126b06387ea32673ac8c8718193 (patch) | |
| tree | ef0502e191db2f29cc636c46d41556bb3876b551 | |
| parent | 24f6b3a13869919c8e1b4d9734a188b62e8d6240 (diff) | |
| download | drakx-03af5cea74c7c126b06387ea32673ac8c8718193.tar drakx-03af5cea74c7c126b06387ea32673ac8c8718193.tar.gz drakx-03af5cea74c7c126b06387ea32673ac8c8718193.tar.bz2 drakx-03af5cea74c7c126b06387ea32673ac8c8718193.tar.xz drakx-03af5cea74c7c126b06387ea32673ac8c8718193.zip | |
autologin: support lxdm & slim too (#3715, based on Derek Jennings
suggestion)
also install autologin for lxdm & slim too
(backported from trunk)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/any.pm | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index fc5ca5d79..d4c55d85e 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- autologin: + o support lxdm & slim too (#3715, Derek Jennings) + o install autologin for lxdm & slim too - drakauth: don't update UsePAM option in sshd configuration - drakxservices: o when listing services ensure disabled services that can be enabled are diff --git a/perl-install/any.pm b/perl-install/any.pm index 76ad7509b..7b14429a8 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -707,6 +707,11 @@ sub get_autologin() { { user => $autologin_user, desktop => $desktop, dm => $dm }; } +sub is_standalone_autologin_needed { + my ($dm) = @_; + return member($dm, qw(lxdm slim xdm)); +} + sub set_autologin { my ($do_pkgs, $autologin) = @_; log::l("set_autologin $autologin->{user} $autologin->{desktop}"); @@ -715,7 +720,7 @@ sub set_autologin { $autologin->{dm} ||= 'xdm'; $do_pkgs->ensure_is_installed($autologin->{dm}) or return; - if ($autologin->{user} && $autologin->{dm} eq 'xdm') { + if ($autologin->{user} && is_standalone_autologin_needed($autologin->{dm})) { $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin') or return; } @@ -735,7 +740,8 @@ sub set_autologin { )) } if -e $gdm_conffile; my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin"; - if ($autologin->{dm} eq 'xdm') { + # TODO: configure lxdm in /etx/lxdm/lxdm.conf + if (is_standalone_autologin_needed($autologin->{dm})) { setVarsInShMode($xdm_autologin_cfg, 0644, { USER => $autologin->{user}, AUTOLOGIN => bool2yesno($autologin->{user}), EXEC => '/usr/bin/startx.autologin' }); } else { |