From 259d8d6a9665eebdda7e038cf39b61f6ceb732f8 Mon Sep 17 00:00:00 2001
From: Florent Villard <warly@mandriva.com>
Date: Tue, 20 Jan 2004 16:34:42 +0000
Subject: adap bmp2mdk command line to new syslinux boot image

---
 make_boot_img | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/make_boot_img b/make_boot_img
index 31ac922dc..825632a94 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -71,6 +71,7 @@ foreach (@kernels) {
     if ($img =~ /rdz$/) {
 	initrd($mnt, "$img-$_");
     } else {
+	print "KERNELS inside TOTOTOTOTOTO $_\n";
 	print STDERR "calling boot_img_$arch\n";
 	$::{"boot_img_$arch"}->($mnt, "$img-$_", glob("kernel/all.kernels/$_/boot/vmlinu*"));
 	rename("$img-$main", "$img");
@@ -83,12 +84,14 @@ if ($arch =~ /x86_64/ && $img =~ /all/) {
 if ($arch =~ /i.86/ && $img =~ /all/) {
     isolinux($main, @kernels);
 
+    if (0) {
     my ($img, $img_sav) = ("images/cdrom.img-$main", 'images/cdrom.img-sav');
     rename($img, $img_sav);
     $type = 'cdrom';
     $::{"boot_img_$arch"}->($mnt, $img, "kernel/all.kernels/$main/boot/vmlinu*", sub { $_[0] =~ s/\bautomatic=\S+\b//; "$_[0] changedisk" });
     rename($img, 'images/cdrom-changedisk.img');
     rename($img_sav, $img);
+    }
 }
 
 if (my ($tftpboot) = grep { -e $_ } qw(/tftpboot /var/lib/tftpboot)) {
@@ -176,16 +179,17 @@ sub entries_append {
 sub boot_img_i386 {
     my ($mnt, $img, $kernel, $args_callback) = @_;
 
+    $img =~ /\*/ and return;
     __ "$sudo umount $mnt 2>/dev/null";
 
     if ($type eq "hd") {
-	_ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img";
+	_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img";
     } elsif ($type eq "all") {
 	_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img";
     } elsif ($type eq "blank") {
 	_ "bunzip2 -c $instdir/init-data/msgboot-blank.img.bz2 > $img";
     } else {
-	_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo.img.bz2 > $img";
+	_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img";
     }
 
 
@@ -649,7 +653,7 @@ sub isolinux {
 	#- 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:371,144,4,8,64+60 clear:600,800,64+127 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg";
+	_ "lilo-bmp2mdk mode:0x103 progress:405,166,4,14,64+26 clear:600,800,64+127 pos:0,0 <isolinux-graphic.bmp >isolinux/boot.msg";
     }
     _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin";
     output "isolinux/isolinux.cfg", "
-- 
cgit v1.2.1