From 2b049f0f6d1972e445829a2503eaf6d306896e9d Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 29 Oct 1999 16:37:52 +0000
Subject: *** empty log message ***

---
 perl-install/install_any.pm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

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

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index c76778f63..0d08adebc 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -303,7 +303,7 @@ sub lnx4win_postinstall {
     run_program::run("rdev", $kernel, "/dev/loop7");
 
     unlink "$dir/size.txt";
-    unlink "$dir/swapfile.txt";
+    unlink "$dir/swapsize.txt";
 
     mkdir "$prefix/initrd", 0755;
     symlinkf "/initrd/dos", "$prefix/mnt/dos";
@@ -319,6 +319,31 @@ sub unlockCdroms {
       foreach detect_devices::cdroms();
 }
 
+sub setupFB {
+    my ($o, $vga) = @_;
+
+    #- install needed packages for frame buffer.
+    pkgs::select($o->{packages}, $o->{packages}{'kernel-fb'});
+    pkgs::select($o->{packages}, $o->{packages}{'XFree86-FBDev'});
+    $o->installPackages($o->{packages});
+
+    #- update lilo entries with a new fb label. a bit hack.
+    my $root = $o->{bootloader}{entries}{'/boot/vmlinuz'}{root};
+    if (lilo::add_kernel($o->{prefix}, $o->{bootloader}, kernelVersion(), 'fb',
+			 {
+			  label => 'fb',
+			  root => $root,
+			  vga => $vga || 785, #- TODO default to 640x480x16.
+			 })) {
+	$o->{bootloader}{default} = 'fb';
+	lilo::install($o->{prefix}, $o->{bootloader});
+    } else {
+	#- should deactivate X11 in such case.
+	#- TODO
+	die _("I can't access the kernel with frame buffer support.\nDisabling automatic X11 startup if any.");
+    }
+}
+
 sub auto_inst_file() { "$::o->{prefix}/root/auto_inst.cfg.pl" }
 
 sub g_auto_install(;$) {
-- 
cgit v1.2.1