always enable ACPI on x86_64, add "noacpi" entry in that case, add more

boot images on x86_64 too, handle special "cdcom" images, specialise
boot logo for amd64.

1 files changed, 7 insertions, 4 deletions

diff --git a/make_boot_img b/make_boot_img
index 108cd37f7..c71bfa30e 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -12,7 +12,7 @@ rename 'all.modules', 'kernel/all.modules';
 
 my $default_append = "ramdisk_size=128000 root=/dev/ram3";
 # full acpi support for amd64, enough acpi support for x86 ht, no acpi for others
-my $default_acpi = $arch =~ /i.86/ ? "acpi=ht" : $arch =~ /x86_64/ ? "acpi=off" : "acpi=off";
+my $default_acpi = $arch =~ /i.86/ ? "acpi=ht" : $arch =~ /x86_64/ ? "" : "acpi=off";
 my $default_vga = "vga=788";
 
 my $instdir = "mdk-stage1";
@@ -42,7 +42,7 @@ my @kernels = grep { /^2/ } all('kernel/all.kernels');
 
 my @all_images = (
 		  if_($arch =~ /i.86/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'),
-		  if_($arch =~ /x86_64/, 'cdrom.img', 'isolinux', 'boot.iso'),
+		  if_($arch =~ /x86_64/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'network.img', 'network_drivers.img'),
 		  if_($arch =~ /ia64/, 'all.img'),
 		 );
 
@@ -200,6 +200,7 @@ sub entries_append {
     my @entries = (
         (map { $_->[0] => "$automatic $default_acpi $_->[1]" } group_by2(@simple_entries)),
 	acpi => "$automatic $default_vga",
+	if_(!$default_acpi, noacpi => "$automatic $default_vga acpi=off"),
 	if_(member($type, "cdrom", "all"), oem => "automatic=method:cdrom $default_vga $default_acpi rescue oem rw",),
         if_($type eq "all", all => "pcmcia $default_vga $default_acpi"),
     );
@@ -675,7 +676,7 @@ sub bmp_to_msg {
 
 sub isolinux {
     my ($main, @kernels) = @_;
-    @kernels = ($main, grep { $_ ne $main } @kernels);
+    @kernels = ($main, grep { $_ ne $main && $_ !~ /cdcom/ } @kernels);
     _ "rm -rf isolinux"; mkdir "isolinux", 0777;
 
     each_index {
@@ -686,7 +687,9 @@ sub isolinux {
 	_ "mv images/all.rdz-$_ isolinux/alt$::i/all.rdz";
     } @kernels;
 
-    bmp_to_msg('isolinux-graphic.bmp', 'isolinux/boot.msg', '397,190,14,6', 18, 18);
+	my $bmp_arch = $arch =~ /x86_64/ ? ".amd64" : "";
+	my $bmp_bgcolor = $arch =~ /x86_64/ ? 34 : 18;
+    bmp_to_msg("isolinux-graphic$bmp_arch.bmp", 'isolinux/boot.msg', $bmp_bgcolor, $bmp_bgcolor);
 
     _ "cp /usr/lib/syslinux/isolinux.bin isolinux/isolinux.bin";
     _ "install -m 644 -D /boot/memtest* isolinux/test/memtest.bin";