This commit was manufactured by cvs2svn to create tag 'MDK92-AMD64'.MDK92-AMD64

1 files changed, 8 insertions, 3 deletions

diff --git a/make_boot_img b/make_boot_img
index 4df3d2c45..f56baaba8 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -122,7 +122,7 @@ sub initrd {
 	_ "$sudo mknod $mnt/dev/ttyp0 c 3 0";
     }
 
-    if (member($type, qw(pcmcia all network)) && $arch !~ /ppc|ia64|x86_64/) {
+    if (member($type, qw(pcmcia all network)) && $arch !~ /ppc|ia64/) {
 	 _ "$sudo cp -a /etc/pcmcia $mnt/etc";
 	 _ "cp $mnt/etc/pcmcia/config /tmp/pcmcia_config_tmp";
 	 _ "tools/patch_pcmcia_config.pl /tmp/pcmcia_config_tmp kernel/all.modules/$main/modules.dep";
@@ -622,7 +622,7 @@ rescue-net:             boots the rescue image from a network server
 
 sub isolinux {
     my ($main, @kernels) = @_;
-    @kernels = ($main, grep { $_ ne $main } @kernels);
+    @kernels = ($main, grep { $_ ne $main && $_ !~ /cdcom/ } @kernels);
     _ "rm -rf isolinux"; mkdir "isolinux", 0777;
     my $i = 0;
     foreach (@kernels) {
@@ -637,7 +637,12 @@ 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";
+	if ($arch eq "x86_64") {
+	    _ "bunzip2 -c $instdir/init-data/boot-install-lilo-800-V64.msg.bz2 >isolinux/boot.msg";
+	}
+	else {
+	    _ "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";
+	}
     }
     _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin";
     output "isolinux/isolinux.cfg", "