summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-10-15 12:56:11 +0000
committerOlivier Blin <oblin@mandriva.com>2009-10-15 12:56:11 +0000
commit58e97a946f52616d8fd90e88f4fa7a162714fb26 (patch)
tree839504379beb405c4d9449bd6244b964de97a2fd /perl-install
parent8b3e7b22d3ba2a6d23bcbf2eb14a358bf44c2ce4 (diff)
downloaddrakx-58e97a946f52616d8fd90e88f4fa7a162714fb26.tar
drakx-58e97a946f52616d8fd90e88f4fa7a162714fb26.tar.gz
drakx-58e97a946f52616d8fd90e88f4fa7a162714fb26.tar.bz2
drakx-58e97a946f52616d8fd90e88f4fa7a162714fb26.tar.xz
drakx-58e97a946f52616d8fd90e88f4fa7a162714fb26.zip
finish-install: do not offer to configure 3D desktop if none is installed (requires drak3d >= 1.27)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/finish-install2
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0911aa664..9acba1d1e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- finish-install: do not offer to configure 3D desktop if none is
+ installed (requires drak3d >= 1.27)
+
Version 12.65 - 14 October 2009
- partitioning wizard:
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index c8cd43096..80240e6b5 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -172,6 +172,8 @@ sub ask_users() {
sub ask_glx() {
require Xconfig::glx;
+ my @installed_types = Xconfig::glx::filter_installed_types(\@Xconfig::glx::gl_compositing_types);
+ any { $_->{type} ne "none" } @installed_types or return;
my $glx = Xconfig::glx::detect_may_install($in->do_pkgs);
if ($glx->{supported} && Xconfig::glx::choose_interactive($in, $glx, 'installed_only')) {
Xconfig::glx::write($glx);