summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-04-02 10:50:18 +0000
committerOlivier Blin <oblin@mandriva.com>2008-04-02 10:50:18 +0000
commitde3b0915db4dd50dc2611ef75e723c65eadeea04 (patch)
treea2fc1b0fb41c9745c04b063daa3a60e62acbd0d0 /images
parentbab6661627dad19134bdb9e2af254688571e0d42 (diff)
downloaddrakx-de3b0915db4dd50dc2611ef75e723c65eadeea04.tar
drakx-de3b0915db4dd50dc2611ef75e723c65eadeea04.tar.gz
drakx-de3b0915db4dd50dc2611ef75e723c65eadeea04.tar.bz2
drakx-de3b0915db4dd50dc2611ef75e723c65eadeea04.tar.xz
drakx-de3b0915db4dd50dc2611ef75e723c65eadeea04.zip
1.29
Diffstat (limited to 'images')
-rw-r--r--images/Makefile2
-rw-r--r--images/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile
index c0294cb06..dd7ba322e 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -1,6 +1,6 @@
include ../Makefile.config
-VERSION=1.28
+VERSION=1.29
PRODUCT=drakx-installer-images
KERNELS=$(shell rpm -qf /lib/modules/2.*)
diff --git a/images/NEWS b/images/NEWS
index 7509d6bed..da0c86fe2 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,7 @@
+Version 1.29 - 2 April 2008, by Olivier "blino" Blin
+
+- use "Mdv Boot ISO" as label for boot.iso
+
Version 1.28 - 12 February 2008, by Olivier "blino" Blin
- restore full modules.alias (depmod keeps only available modules in
6a84..8b21db944 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -638,7 +638,7 @@ sub set_autologin {
)) };
my $xdm_autologin_cfg = "$::prefix/etc/sysconfig/autologin";
- if (member($o_wm, 'KDE', 'GNOME')) {
+ if (member($o_wm, 'KDE', 'KDE4', 'GNOME')) {
unlink $xdm_autologin_cfg;
} else {
$do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin') if $o_user;
@@ -837,8 +837,9 @@ sub autologin {
my @wm = sessions();
my @users = map { $_->{name} } @{$o->{users} || []};
- if (member('KDE', @wm) && @users == 1 && $o->{meta_class} eq 'desktop') {
- $o->{desktop} = 'KDE';
+ my $kde_desktop = find { member($_, 'KDE', 'KDE4') } @wm;
+ if ($kde_desktop && @users == 1 && $o->{meta_class} eq 'desktop') {
+ $o->{desktop} = $kde_desktop;
$o->{autologin} = $users[0];
} elsif (@wm > 1 && @users && !$o->{authentication}{NIS} && $o->{security} <= 2) {
my $use_autologin = @users == 1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index eed4647ac..f32ee7467 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- detect KDE4 when configuring autologin
+
Version 10.42 - 26 June 2008
- fix reading rpm macros from /etc/macros.d/ (esp. %_filetriggers_dir)
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 555fc9254..ac7566755 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -755,7 +755,7 @@ sub addUser {
if ($o->{autologin}) {
$o->{desktop} ||= first(any::sessions());
- $o->pkg_install("autologin") if !member($o->{desktop}, 'KDE', 'GNOME');
+ $o->pkg_install("autologin") if !member($o->{desktop}, 'KDE', 'KDE4', 'GNOME');
}
any::set_autologin($o->do_pkgs, $o->{autologin}, $o->{desktop});