summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-07-09 14:17:43 +0000
committerOlivier Blin <oblin@mandriva.com>2008-07-09 14:17:43 +0000
commiteb6ab3abc567974221d35270bb0f189675dd4798 (patch)
tree9526cb328369e69fededd667090e840a63463f9c
parentd6b9b8ab1743254e3a3644bff78d165f7d1020e6 (diff)
downloaddrakx-eb6ab3abc567974221d35270bb0f189675dd4798.tar
drakx-eb6ab3abc567974221d35270bb0f189675dd4798.tar.gz
drakx-eb6ab3abc567974221d35270bb0f189675dd4798.tar.bz2
drakx-eb6ab3abc567974221d35270bb0f189675dd4798.tar.xz
drakx-eb6ab3abc567974221d35270bb0f189675dd4798.zip
update autologin file path for kdm4
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm5
-rw-r--r--perl-install/install/NEWS1
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3765da5ae..5381225c8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- update autologin file path for kdm4
- change default authentication to local (instead of ldap)
Version 10.43 - 04 July 2008
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 8b21db944..5fd4e0a44 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -606,7 +606,7 @@ You can create additional entries or change the existing ones."), [ {
sub get_autologin() {
my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop");
my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf";
- my $kdm_file = "$::prefix/etc/kde/kdm/kdmrc";
+ my $kdm_file = "$::prefix/usr/share/config/kdm/kdmrc";
my $desktop = $desktop{DESKTOP} || (! -e $kdm_file && -e $gdm_file ? 'GNOME' : 'KDE');
my $autologin = do {
if (($desktop{DISPLAYMANAGER} || $desktop) eq 'GNOME') {
@@ -626,7 +626,8 @@ sub set_autologin {
my $autologin = bool2text($o_user);
#- Configure KDM / MDKKDM
- eval { common::update_gnomekderc_no_create("$::prefix/etc/kde/kdm/kdmrc", 'X-:0-Core' => (
+ #- /usr/share/config/kdm/kdmrc is an alternative pointing in /var
+ eval { common::update_gnomekderc_no_create("$::prefix/usr/share/config/kdm/kdmrc", 'X-:0-Core' => (
AutoLoginEnable => $autologin,
AutoLoginUser => $o_user,
)) };
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e0af81c7f..3a402761c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- update autologin file path for kdm4
- change default authentication to local (instead of ldap)
Version 10.44 - 8 July 2008