diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-05-03 14:18:52 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-05-03 14:18:52 +0000 |
| commit | f4017ea2f9cf2452120b8bd072b5c03ef61784c9 (patch) | |
| tree | b5a11190c33efd1519391c7e44fc134a6516aaee | |
| parent | 8f5d72a12b4488f3007c73537d5212b6b67cadce (diff) | |
| download | drakx-backup-do-not-use-f4017ea2f9cf2452120b8bd072b5c03ef61784c9.tar drakx-backup-do-not-use-f4017ea2f9cf2452120b8bd072b5c03ef61784c9.tar.gz drakx-backup-do-not-use-f4017ea2f9cf2452120b8bd072b5c03ef61784c9.tar.bz2 drakx-backup-do-not-use-f4017ea2f9cf2452120b8bd072b5c03ef61784c9.tar.xz drakx-backup-do-not-use-f4017ea2f9cf2452120b8bd072b5c03ef61784c9.zip | |
*** empty log message ***
| -rwxr-xr-x | make_boot_img | 15 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 2 | ||||
| -rwxr-xr-x | update_kernel | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/make_boot_img b/make_boot_img index 37a575846..742a47ba2 100755 --- a/make_boot_img +++ b/make_boot_img @@ -90,16 +90,25 @@ F1 help.msg F2 boot.msg label linux kernel vmlinuz - append $ks ramdisk_size=32000 initrd=$type.rdz $type + append $ks ramdisk_size=32000 initrd=$type.rdz $type vga=788 +label vgalo + kernel vmlinuz + append $ks ramdisk_size=32000 initrd=$type.rdz $type vga=785 +label vgahi + kernel vmlinuz + append $ks ramdisk_size=32000 initrd=$type.rdz $type vga=791 +label vga16 + kernel vmlinuz + append $ks ramdisk_size=32000 initrd=$type.rdz $type vga16 label text kernel vmlinuz append $ks ramdisk_size=32000 initrd=$type.rdz $type text label patch kernel vmlinuz - append ramdisk_size=32000 initrd=$type.rdz $type patch + append ramdisk_size=32000 initrd=$type.rdz $type patch vga=788 label expert kernel vmlinuz - append ramdisk_size=32000 initrd=$type.rdz $type expert + append ramdisk_size=32000 initrd=$type.rdz $type expert vga=788 label rescue kernel vmlinuz append ramdisk_size=32000 initrd=$type.rdz $type rescue rw diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 074674bff..526c6c684 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -529,7 +529,7 @@ sub main { my $f = ${{ method => sub { $o->{method} = $v }, pcmcia => sub { $o->{pcmcia} = $v }, - vga => sub { $o->{vga16} = $v }, + vga16 => sub { $o->{vga16} = $v }, step => sub { $o->{steps}{first} = $v }, expert => sub { $::expert = 1; $::beginner = 0 }, beginner => sub { $::beginner = $v }, diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index b5ab22045..82b4dca5f 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -802,7 +802,7 @@ sub create_logo_window() { sub init_sizes() { ($::rootheight, $::rootwidth) = (480, 640); ($::rootheight, $::rootwidth) = my_gtk::gtkroot()->get_size; - ($::rootheight, $::rootwidth) = (min(600, $::rootheight), min(800, $::rootwidth)); + ($::rootheight, $::rootwidth) = (min(768, $::rootheight), min(1024, $::rootwidth)); ($::stepswidth, $::stepsheight) = (140, $::rootheight); ($::logowidth, $::logoheight) = ($::rootwidth - $::stepswidth, 40); ($::helpwidth, $::helpheight) = ($::rootwidth - $::stepswidth, 100); diff --git a/update_kernel b/update_kernel index 5f70073f7..de084b149 100755 --- a/update_kernel +++ b/update_kernel @@ -25,9 +25,9 @@ NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o usb-*.o" PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o" if [ "$ARCH" == "i386" ]; then - #set 640x480x16 resolution on boot. + #disable any existing resolution!!! cp -f $KERNEL_BOOT_PATH/boot/vmlinuz* vmlinuz - /usr/sbin/rdev -v vmlinuz 788 #785 + /usr/sbin/rdev -v vmlinuz 65535 #788 #785 cp -f vmlinuz /export/lnx4win rm -rf install_pcmcia_modules ; install -d install_pcmcia_modules |