summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-08-13 14:10:26 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-08-13 14:10:26 +0000
commitb1d394448c676ad97e4ec6b14736260cd144f07f (patch)
treee46d0fe05b626ef762913bf452eee1a5616b799d
parent6b90d734b661da0b3090e80463c49b92e8a69b7f (diff)
downloaddrakx-b1d394448c676ad97e4ec6b14736260cd144f07f.tar
drakx-b1d394448c676ad97e4ec6b14736260cd144f07f.tar.gz
drakx-b1d394448c676ad97e4ec6b14736260cd144f07f.tar.bz2
drakx-b1d394448c676ad97e4ec6b14736260cd144f07f.tar.xz
drakx-b1d394448c676ad97e4ec6b14736260cd144f07f.zip
(set_autologin) parameters are optionnal, writing empty variables in
kdmrc and the like means disabled autologin
-rw-r--r--perl-install/any.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7e39a424e..dde3c9789 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -417,33 +417,33 @@ sub get_autologin() {
}
sub set_autologin {
- my ($user, $wm) = @_;
- log::l("set_autologin $user $wm");
- my $autologin = bool2text($user);
+ my ($o_user, $o_wm) = @_;
+ log::l("set_autologin $o_user $o_wm");
+ my $autologin = bool2text($o_user);
#- Configure KDM / MDKKDM
eval { update_gnomekderc("$::prefix/usr/share/config/kdm/kdmrc", 'X-:0-Core' => (
AutoLoginEnable => $autologin,
- AutoLoginUser => $user,
+ AutoLoginUser => $o_user,
)) };
#- Configure GDM
eval { update_gnomekderc("$::prefix/etc/X11/gdm/gdm.conf", daemon => (
AutomaticLoginEnable => $autologin,
- AutomaticLogin => $user,
+ AutomaticLogin => $o_user,
)) };
my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
- if (member($wm, 'KDE', 'GNOME')) {
+ if (member($o_wm, 'KDE', 'GNOME')) {
unlink $xdm_autologin_cfg;
} else {
setVarsInShMode($xdm_autologin_cfg, 0644,
- { USER => $user, AUTOLOGIN => bool2yesno($user), EXEC => '/usr/X11R6/bin/startx.autologin' });
+ { USER => $o_user, AUTOLOGIN => bool2yesno($o_user), EXEC => '/usr/X11R6/bin/startx.autologin' });
}
- if ($user) {
- my $home = (getpwnam($user))[7];
- set_window_manager($home, $wm);
+ if ($o_user) {
+ my $home = (getpwnam($o_user))[7];
+ set_window_manager($home, $o_wm);
}
}
sub set_window_manager {