diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-07-09 14:20:16 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-07-09 14:20:16 +0000 |
| commit | 0fbe6d5f8e9553b3e8f25b7d66935f850ae01d54 (patch) | |
| tree | 47a3e98e40c553eb5d574abfc71ea2a1ea411dd3 | |
| parent | eb6ab3abc567974221d35270bb0f189675dd4798 (diff) | |
| download | drakx-0fbe6d5f8e9553b3e8f25b7d66935f850ae01d54.tar drakx-0fbe6d5f8e9553b3e8f25b7d66935f850ae01d54.tar.gz drakx-0fbe6d5f8e9553b3e8f25b7d66935f850ae01d54.tar.bz2 drakx-0fbe6d5f8e9553b3e8f25b7d66935f850ae01d54.tar.xz drakx-0fbe6d5f8e9553b3e8f25b7d66935f850ae01d54.zip | |
default to KDE4 (instead of KDE) if kdm config exists when reading autologin configuration
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5381225c8..229433e7b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,6 @@ - update autologin file path for kdm4 +- default to KDE4 (instead of KDE) if kdm config exists when reading + autologin configuration - 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 5fd4e0a44..eda464f54 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -607,7 +607,7 @@ sub get_autologin() { my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop"); my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf"; my $kdm_file = "$::prefix/usr/share/config/kdm/kdmrc"; - my $desktop = $desktop{DESKTOP} || (! -e $kdm_file && -e $gdm_file ? 'GNOME' : 'KDE'); + my $desktop = $desktop{DESKTOP} || (! -e $kdm_file && -e $gdm_file ? 'GNOME' : 'KDE4'); my $autologin = do { if (($desktop{DISPLAYMANAGER} || $desktop) eq 'GNOME') { my %conf = read_gnomekderc($gdm_file, 'daemon'); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 3a402761c..afd7133cb 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - update autologin file path for kdm4 +- default to KDE4 (instead of KDE) if kdm config exists when reading + autologin configuration - change default authentication to local (instead of ldap) Version 10.44 - 8 July 2008 |