diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-10-29 16:37:52 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-10-29 16:37:52 +0000 |
| commit | 2b049f0f6d1972e445829a2503eaf6d306896e9d (patch) | |
| tree | a66afbe9702d516675a3bea370ced51ed5c8c616 /perl-install/install_any.pm | |
| parent | aa912d0daeaa6d4d84addfd2fc0ebba11e137edd (diff) | |
| download | drakx-2b049f0f6d1972e445829a2503eaf6d306896e9d.tar drakx-2b049f0f6d1972e445829a2503eaf6d306896e9d.tar.gz drakx-2b049f0f6d1972e445829a2503eaf6d306896e9d.tar.bz2 drakx-2b049f0f6d1972e445829a2503eaf6d306896e9d.tar.xz drakx-2b049f0f6d1972e445829a2503eaf6d306896e9d.zip | |
*** empty log message ***
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 27 |
1 files changed, 26 insertions, 1 deletions
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(;$) { |