From b7367403e66834de49d41703293ad210104fa14a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 20 Jan 2004 22:15:30 +0000
Subject: revert warly's committing debug things

---
 make_boot_img | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/make_boot_img b/make_boot_img
index bc5f18548..752d85ec5 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -83,14 +83,12 @@ 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)) {
@@ -178,17 +176,16 @@ 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-graphicallogo-2880.img.bz2 > $img";
+	_ "bunzip2 -c $instdir/init-data/msgboot.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-2880.img.bz2 > $img";
+	_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo.img.bz2 > $img";
     }
 
 
-- 
cgit v1.2.1