From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 10 Jun 2008 14:55:04 +0000 (+0200)
Subject: Fixed grub.conf / start with no acpi
X-Git-Tag: v2.3-beta1~48^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2c72c14711ee59e3f98646d6dd1158fe2f79492;p=ipfire-2.x.git

Fixed grub.conf / start with no acpi
---

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 74918e8f49..911fce5e95 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -14,18 +14,33 @@ title IPFire (vesafb 1024x768)
   kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire (noacpi)
+title IPFire (acpi=off)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 noacpi MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 2
+title IPFire (vesafb 1024x768, acpi=off)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 acpi=off MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 3
 title IPFire SMP/HT
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 MOUNT
   initrd /ipfirerd-KVER-smp.img
-  savedefault 3
+  savedefault 4
 title IPFire SMP/HT (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER-smp.img
-  savedefault 4
+  savedefault 5
+title IPFire SMP/HT (acpi=off)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 acpi=off MOUNT
+  initrd /ipfirerd-KVER-smp.img
+  savedefault 6
+title IPFire SMP/HT (vesafb 1024x768, acpi=off)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire-smp root=ROOT panic=10 vga=791 acpi=off MOUNT
+  initrd /ipfirerd-KVER-smp.img
+  savedefault 7