summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-09-03 07:06:38 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2003-09-03 07:06:38 +0000
commit00945259b316710181dd131bca1318cfc27a9e0b (patch)
tree387ee991bec9a4bb9a87be55f1b12b0a50322585
parent6e5eebffaffe3021a342fa0de12140073c8b4592 (diff)
downloaddrakx-backup-do-not-use-00945259b316710181dd131bca1318cfc27a9e0b.tar
drakx-backup-do-not-use-00945259b316710181dd131bca1318cfc27a9e0b.tar.gz
drakx-backup-do-not-use-00945259b316710181dd131bca1318cfc27a9e0b.tar.bz2
drakx-backup-do-not-use-00945259b316710181dd131bca1318cfc27a9e0b.tar.xz
drakx-backup-do-not-use-00945259b316710181dd131bca1318cfc27a9e0b.zip
acpi=ht is x86 only
-rwxr-xr-xmake_boot_img3
1 files changed, 2 insertions, 1 deletions
diff --git a/make_boot_img b/make_boot_img
index a89a156e6..0653e73ce 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -15,7 +15,8 @@ rename 'all.kernels', 'kernel/all.kernels';
rename 'all.modules', 'kernel/all.modules';
$default_append = "ramdisk_size=128000 root=/dev/ram3";
-$default_acpi = "acpi=ht";
+# full acpi support for amd64, enough acpi support for x86 ht, no acpi for others
+$default_acpi = ($arch =~ /i.86/ ? "acpi=ht" : ($arch =~ /x86_64/ ? "acpi=off" : "acpi=off"));
$default_vga = "vga=788";
$instdir = "mdk-stage1";