diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-27 08:09:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-27 08:09:57 +0000 |
| commit | 6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab (patch) | |
| tree | 23df90df1d2b45befe8d62f5f452399d2a79f394 /perl-install/install_steps.pm | |
| parent | 2e7bec9cf05c2ad1d747260087aab55f00656915 (diff) | |
| download | drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.gz drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.bz2 drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.xz drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.zip | |
add __regexp suffix to matching_desc() and matching_driver()
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index e6a24516a..7a7ee2b7a 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -853,22 +853,22 @@ sub setupBootloaderBefore { } #- check for valid fb mode to enable a default boot with frame buffer. - my $vga = $o->{allowFB} && (!detect_devices::matching_desc('3D Rage LT') && - !detect_devices::matching_desc('Rage Mobility [PL]') && - !detect_devices::matching_desc('i740') && - !detect_devices::matching_desc('Matrox') && - !detect_devices::matching_desc('Tseng.*ET6\d00') && - !detect_devices::matching_desc('SiS.*SG86C2.5') && - !detect_devices::matching_desc('SiS.*559[78]') && - !detect_devices::matching_desc('SiS.*300') && - !detect_devices::matching_desc('SiS.*540') && - !detect_devices::matching_desc('SiS.*6C?326') && - !detect_devices::matching_desc('SiS.*6C?236') && - !detect_devices::matching_desc('Voodoo [35]|Voodoo Banshee') && #- 3d acceleration seems to bug in fb mode - !detect_devices::matching_desc('828[14][05].* CGC') #- i810 & i845 now have FB support during install but we disable it afterwards + my $vga = $o->{allowFB} && (!detect_devices::matching_desc__regexp('3D Rage LT') && + !detect_devices::matching_desc__regexp('Rage Mobility [PL]') && + !detect_devices::matching_desc__regexp('i740') && + !detect_devices::matching_desc__regexp('Matrox') && + !detect_devices::matching_desc__regexp('Tseng.*ET6\d00') && + !detect_devices::matching_desc__regexp('SiS.*SG86C2.5') && + !detect_devices::matching_desc__regexp('SiS.*559[78]') && + !detect_devices::matching_desc__regexp('SiS.*300') && + !detect_devices::matching_desc__regexp('SiS.*540') && + !detect_devices::matching_desc__regexp('SiS.*6C?326') && + !detect_devices::matching_desc__regexp('SiS.*6C?236') && + !detect_devices::matching_desc__regexp('Voodoo [35]|Voodoo Banshee') && #- 3d acceleration seems to bug in fb mode + !detect_devices::matching_desc__regexp('828[14][05].* CGC') #- i810 & i845 now have FB support during install but we disable it afterwards ); - my $force_vga = $o->{allowFB} && (detect_devices::matching_desc('SiS.*630') || #- SiS 630 need frame buffer. - detect_devices::matching_desc('GeForce.*Integrated') #- needed for fbdev driver (hack). + my $force_vga = $o->{allowFB} && (detect_devices::matching_desc__regexp('SiS.*630') || #- SiS 630 need frame buffer. + detect_devices::matching_desc__regexp('GeForce.*Integrated') #- needed for fbdev driver (hack). ); #- propose the default fb mode for kernel fb, if aurora or bootsplash is installed. |