*** empty log message ***

3 files changed, 11 insertions, 41 deletions

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;
     }
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index c4207525f..ae67f4c0a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -34,7 +34,7 @@ XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128
 XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs XFree86-FBDev XFree86-server
 XFree86 XFree86-glide-module Device3DFX Glide_V3-DRI Glide_V5 Mesa
 dhcpcd pump dhcpxd dhcp-client isdn4net isdn4k-utils dev pptp-adsl-fr rp-pppoe ppp ypbind
-rhs-printfilters lpr cups cups-drivers pnm2ppa Lexmark-1100-printer-driver__lm1100 samba ncpfs kernel-fb
+rhs-printfilters lpr cups cups-drivers pnm2ppa Lexmark-1100-printer-driver__lm1100 samba ncpfs
 );
 
 #-######################################################################################
@@ -379,38 +379,15 @@ sub ejectCdrom(;$) {
 sub setupFB {
     my ($o, $vga) = @_;
 
-    #- install needed packages for frame buffer.
-    $o->pkg_install('kernel-fb');
-
     $vga ||= 785; #- assume at least 640x480x16.
 
     require bootloader;
-    #- update bootloader entries with a new fb label. a bit hack unless
-    #- a frame buffer kernel is used, in such case we use it instead
-    #- with the right mode, nothing more to do.
-    foreach (qw(secure smp)) {
-	if (my $e = bootloader::get("/boot/vmlinuz-$_", $o->{bootloader})) {
-	    if ($_ eq 'secure') {
-		log::l("warning: kernel-secure is not fb, using a kernel-fb instead");
-		#- nothing done, fall through linux-fb.
-	    } else {
-		$e->{vga} = $vga;
-		goto ok;
-	    }
+    #- update bootloader entries with vga, all kernel are now framebuffer.
+    foreach (qw(vmlinuz vmlinuz-secure vmlinuz-smp vmlinuz-hack)) {
+	if (my $e = bootloader::get("/boot/$_", $o->{bootloader})) {
+	    $e->{vga} = $vga;
 	}
     }
-    if (bootloader::add_kernel($o->{prefix}, $o->{bootloader}, kernelVersion($o), 'fb',
-			       {
-				label => 'linux-fb',
-				root => bootloader::get("/boot/vmlinuz", $o->{bootloader})->{root},
-				vga => $vga,
-			       })) {
-	$o->{bootloader}{default} = 'linux-fb';
-    } else {
-	log::l("unable to install kernel with frame buffer support, disabling");
-	return 0;
-    }
-  ok:
     bootloader::install($o->{prefix}, $o->{bootloader}, $o->{fstab}, $o->{hds});
     1;
 }
@@ -658,7 +635,7 @@ sub use_root_part {
 	my $handle = any::inspect($part, $prefix) or die;
 	fs::get_mntpoints_from_fstab($fstab, $handle->{dir}, 'uniq');
     }
-    map { $_->{mntpoint} = 'swap_upgrade' } grep { isSwap($_) } @$fstab; #- use all available swap.
+    map { $_->{mntpoint} = 'swap' } grep { isSwap($_) } @$fstab; #- use all available swap.
     fs::mount_all($fstab, $prefix);
 }
 
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 90ea80424..7325721c3 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -83,8 +83,8 @@ XFree86-8514 XFree86-AGX XFree86-Mach32 XFree86-Mach64 XFree86-Mach8 XFree86-Mon
 XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128
 XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs
 MySQL MySQL_GPL mod_php3 midgard postfix metroess metrotmpl
-kernel-linus kernel-secure kernel-fb kernel-BOOT
-hackkernel hackkernel-BOOT hackkernel-fb hackkernel-headers
+kernel-linus kernel-secure kernel-BOOT
+hackkernel hackkernel-BOOT hackkernel-headers
 hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb 
 autoirpm autoirpm-icons numlock 
 );