diff options
| author | Florent Villard <warly@mandriva.com> | 2004-02-24 17:19:45 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-02-24 17:19:45 +0000 |
| commit | 6c7345249295b1ded22195b1a45f17c85509ddb2 (patch) | |
| tree | 8c7222c34196e0043457cacbccc7f68db627d563 | |
| parent | cb8deb5dacbe44d02287ecae016689920a1e4c5f (diff) | |
| download | drakx-6c7345249295b1ded22195b1a45f17c85509ddb2.tar drakx-6c7345249295b1ded22195b1a45f17c85509ddb2.tar.gz drakx-6c7345249295b1ded22195b1a45f17c85509ddb2.tar.bz2 drakx-6c7345249295b1ded22195b1a45f17c85509ddb2.tar.xz drakx-6c7345249295b1ded22195b1a45f17c85509ddb2.zip | |
add new simpler isolinux image for floppy
change make_boot_image to update floppy boot.msg at make time
| -rw-r--r-- | isolinux-graphic-simple.bmp | bin | 0 -> 480566 bytes | |||
| -rwxr-xr-x | make_boot_img | 19 |
2 files changed, 12 insertions, 7 deletions
diff --git a/isolinux-graphic-simple.bmp b/isolinux-graphic-simple.bmp Binary files differnew file mode 100644 index 000000000..2faf02440 --- /dev/null +++ b/isolinux-graphic-simple.bmp diff --git a/make_boot_img b/make_boot_img index 2d6361ba9..267c20a0e 100755 --- a/make_boot_img +++ b/make_boot_img @@ -172,6 +172,7 @@ sub boot_img_i386 { _ "$sudo mount -t vfat -o umask=0 $img $mnt -o loop"; _ "cat $kernel > $mnt/vmlinuz"; + bmp_to_msg('isolinux-graphic-simple.bmp', "$mnt/boot.msg", 27, 27); (my $rdz = $img) =~ s/\.img/.rdz/; (my $initrd_type = $type) =~ s/-changedisk//; @@ -612,6 +613,15 @@ rescue-net: boots the rescue image from a network server } +sub bmp_to_msg { + my ($bmp, $msg, $progress_color, $clear_color) = @_; + #- change here for newer picture isolinux-graphic.bmp and newer parameters. + #- for old style pictures (9.1 and previous) + # lilo-bmp2mdk mode:0x103 progress:425,173,16,7,64+21 clear:600,800,64+59 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg + #- for current 9.2 pictures. + -e $bmp and _ "lilo-bmp2mdk mode:0x103 progress:397,190,14,6,64+$progress_color clear:600,800,64+$clear_color pos:0,0 <$bmp >$msg" +} + sub isolinux { my ($main, @kernels) = @_; @kernels = ($main, grep { $_ ne $main } @kernels); @@ -625,13 +635,8 @@ sub isolinux { _ "mv images/all.rdz-$_ isolinux/alt$::i/all.rdz"; } @kernels; - if (-e "isolinux-graphic.bmp") { - #- change here for newer picture isolinux-graphic.bmp and newer parameters. - #- for old style pictures (9.1 and previous) - # lilo-bmp2mdk mode:0x103 progress:425,173,16,7,64+21 clear:600,800,64+59 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg - #- for current 9.2 pictures. - _ "lilo-bmp2mdk mode:0x103 progress:397,190,14,6,64+35 clear:600,800,64+33 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg"; - } + bmp_to_msg('isolinux-graphic.bmp', 'isolinux/boot.msg', 18, 18); + _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin"; _ "install -m 644 -D /boot/memtest* isolinux/test/memtest.bin"; output "isolinux/isolinux.cfg", " |
