summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-10-04 05:13:33 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2004-10-04 05:13:33 +0000
commit6f71b388b8a92c339aa5acd73f00dec25af3f474 (patch)
treeb42ca8c085f9efc60abe9ecd8791dc9abe563d59
parent3548bab21543627add1f3131265e6575acc0a7da (diff)
downloaddrakx-6f71b388b8a92c339aa5acd73f00dec25af3f474.tar
drakx-6f71b388b8a92c339aa5acd73f00dec25af3f474.tar.gz
drakx-6f71b388b8a92c339aa5acd73f00dec25af3f474.tar.bz2
drakx-6f71b388b8a92c339aa5acd73f00dec25af3f474.tar.xz
drakx-6f71b388b8a92c339aa5acd73f00dec25af3f474.zip
full acpi support on x86_64, generate the same images as on x86
-rwxr-xr-xmake_boot_img7
1 files changed, 3 insertions, 4 deletions
diff --git a/make_boot_img b/make_boot_img
index 95cdbbc3d..56f26a429 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -11,8 +11,8 @@ rename 'all.kernels', 'kernel/all.kernels';
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";
+# full acpi support for x86_64, enough acpi support for x86 ht, no acpi for others
+my $default_acpi = $arch =~ /i.86/ ? "acpi=ht" : $arch =~ /x86_64/ ? "" : "acpi=off";
my $default_vga = "vga=788";
my $instdir = "mdk-stage1";
@@ -41,8 +41,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 =~ /i.86|x86_64/, 'cdrom.img', 'cdrom-changedisk.img', 'pcmcia.img', 'isolinux', 'boot.iso', 'hd_grub.img', 'network.img', 'network_drivers.img'),
if_($arch =~ /ia64/, 'all.img'),
if_($arch =~ /ppc/, 'all.img'),
);