From 55715b8b922d0af5a5da0938a6df6e9025348154 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 28 Aug 2008 11:00:25 +0000
Subject: - configure vga=785 (640x480) when vga=788 (800x600) fails during
 install   (useful on 800x480 netbooks)

other solutions could be:
- ensure gfxboot choose 785 when it detects 788 is not available
- ensure kernel tries 785 when 788 fails
---
 perl-install/diskdrake/hd_gtk.pm  |  3 ---
 perl-install/install/NEWS         |  3 +++
 perl-install/install/steps_gtk.pm | 13 +++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index e37bdd340..ce9e6cb05 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -102,9 +102,6 @@ sub main {
     $in->ask_from_list_(N("Read carefully!"), N("Please make a backup of your data first"), 
 			[ N_("Exit"), N_("Continue") ], N_("Continue")) eq N_("Continue") or return
       if $::isStandalone;
-    $in->ask_warn('', 
-N("If you plan to use aboot, be careful to leave a free space (2048 sectors is enough)
-at the beginning of the disk")) if arch() eq 'alpha' && !$::isEmbedded;
 
     undef $initializing;
     $w->main;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9f05ee798..564f80d31 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- configure vga=785 (640x480) when vga=788 (800x600) fails during install
+  (useful on 800x480 netbooks)
+
 Version 11.26.1 - 28 August 2008
 
 - fix asterisk in titles
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 5af3e3e6f..a32a195e6 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -123,6 +123,7 @@ sub new($$) {
     install::gtk::init_sizes($o);
     install::gtk::install_theme($o);
     install::gtk::create_steps_window($o);
+    _may_configure_framebuffer_640x480($o);
 
     $ugtk2::grab = 1;
 
@@ -131,6 +132,18 @@ sub new($$) {
     $o;
 }
 
+#- if we success to start X in 640x480 using driver "vesa", 
+#- we configure to use fb on installed system (to ensure splashy works)
+#- (useful on 800x480 netbooks)
+sub _may_configure_framebuffer_640x480 {
+    my ($o) = @_;
+
+    if ($::rootwidth == 640 && !$o->{allowFB}) {
+	$o->{vga} = 785;
+	$o->{allowFB} = 1;
+    }
+}
+
 sub enteringStep {
     my ($o, $step) = @_;
 
-- 
cgit v1.2.1