From 58803c3501676fb0acb85682bccc9d2789f252f0 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 14 Sep 2000 10:14:32 +0000
Subject: *** empty log message ***

---
 perl-install/bootloader.pm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'perl-install/bootloader.pm')

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 5b99a022c..f7095e223 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -253,11 +253,13 @@ wait %d seconds for default boot.
 	       {
 		label => 'linux',
 		root  => "/dev/$root",
+		$vga_fb ? ( vga => $vga_fb) : (), #- using framebuffer
 	       }) if $isSecure || $isSMP;
     add_kernel($prefix, $lilo, $kernelVersion, '',
 	       {
 		label => $isSecure || $isSMP ? 'linux-up' : 'linux',
 		root  => "/dev/$root",
+		$vga_fb ? ( vga => $vga_fb) : (), #- using framebuffer
 	       });
     add_kernel($prefix, $lilo, $kernelVersion, '',
 	       {
@@ -265,16 +267,6 @@ wait %d seconds for default boot.
 		root  => "/dev/$root",
 	       })->{append} .= " failsafe" unless $lilo->{password};
 
-    if (-e "$prefix/boot/vmlinuz-${kernelVersion}fb") {
-	add_kernel($prefix, $lilo, $kernelVersion, 'fb',
-		  {
-		   label => 'linux-fb',
-		   root  => "/dev/$root",
-		   $vga_fb ? ( vga => $vga_fb) : (), #- specific mode for kernel-fb.
-		  });
-	$vga_fb and $lilo->{default} = 'linux-fb'; #- make it by default.
-    }
-
     #- manage hackkernel if installed.
     my $hasHack = -e "$prefix/boot/vmlinuz-hack";
     if ($hasHack) {
@@ -283,6 +275,7 @@ wait %d seconds for default boot.
 		  {
 		   label => 'hack',
 		   root  => "/dev/$root",
+		   $vga_fb ? ( vga => $vga_fb) : (), #- using framebuffer
 		  }) if $hackVersion;
     }
 
-- 
cgit v1.2.1