summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-08-29 09:56:39 +0000
committerFrancois Pons <fpons@mandriva.com>2001-08-29 09:56:39 +0000
commitd90212b23c2a9787583f417c72dd9e4d87ef010d (patch)
tree3b96c40336c6d29f9c9ac8c43e4f19f89b676e54 /perl-install/install_steps.pm
parent3454aef11964e13a3097158e0c398d02b0327559 (diff)
downloaddrakx-d90212b23c2a9787583f417c72dd9e4d87ef010d.tar
drakx-d90212b23c2a9787583f417c72dd9e4d87ef010d.tar.gz
drakx-d90212b23c2a9787583f417c72dd9e4d87ef010d.tar.bz2
drakx-d90212b23c2a9787583f417c72dd9e4d87ef010d.tar.xz
drakx-d90212b23c2a9787583f417c72dd9e4d87ef010d.zip
add support for mandatory frame buffer support (SiS 630) need them for XF3 to
work properly, XF4 does work with it nicely.
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 42dae2510..1db8de554 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -732,10 +732,14 @@ sub setupBootloaderBefore {
} else {
#- check for valid fb mode to enable a default boot with frame buffer.
my $vga = $o->{allowFB} && (!detect_devices::matching_desc('Rage LT') &&
- !detect_devices::matching_desc('SiS') &&
+ (!detect_devices::matching_desc('SiS') ||
+ detect_devices::matching_desc('SiS.*630')) && #- SiS 630 need frame buffer.
!detect_devices::matching_desc('S3 Inc') &&
!detect_devices::matching_desc('Matrox') &&
- !detect_devices::matching_desc('Rage Mobility')) && $o->{vga};
+ !detect_devices::matching_desc('Rage Mobility')
+ ) && $o->{vga};
+ my $force_vga = $o->{allowFB} && (detect_devices::matching_desc('SiS.*630') #- SiS 630 need frame buffer.
+ ) && $o->{vga};
require bootloader;
#- propose the default fb mode for kernel fb, if aurora is installed too.
@@ -744,7 +748,7 @@ sub setupBootloaderBefore {
$p && pkgs::packageFlagInstalled($p);
};
bootloader::suggest($o->{prefix}, $o->{bootloader}, $o->{all_hds}{hds}, $o->{fstab}, install_any::kernelVersion($o),
- $has_aurora && $vga);
+ $force_vga || $vga && $has_aurora);
bootloader::suggest_floppy($o->{bootloader}) if $o->{security} <= 3 && arch() !~ /ppc/;
$o->{bootloader}{keytable} ||= keyboard::keyboard2kmap($o->{keyboard});