From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 6 Sep 2012 14:55:27 +0000 (+0200)
Subject: Remove some kernel boot options.
X-Git-Tag: v2.13-beta1~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be1fe6897c04e1fa4825a656a4bef95cf11d1afe;p=ipfire-2.x.git

Remove some kernel boot options.

These options don't make much sense to me anymore.
SMP code should not be a problem on any CPU as well
as ACPI.
---

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 553b10d42d..2199bf1d89 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -14,28 +14,8 @@ title IPFire
   kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (vesafb 640x480)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=785 MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 1
-title IPFire (vesafb 800x600)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=788 MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 2
 title IPFire (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 3
-title IPFire (acpi disabled)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 acpi=off MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 4
-title IPFire (single Processor)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 nosmp MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 5
+  savedefault 1