X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fgrub%2Fgrub.conf;h=886d6d77b01b8d3eacd1be336a9df4a8315d3054;hp=8dd79adfa9f427a41c40acb805c14ba4407852e4;hb=324b33431a831f08770a992eb1baa552cbf8bc31;hpb=fd383f41eb906d4aca7b28f734302caf139194cd

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 8dd79adfa9..886d6d77b0 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -9,23 +9,28 @@ title IPFire
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (vesafb 1024x768)
+title IPFire (vesafb 640x480)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire (acpi=off)
+title IPFire (vesafb 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 2
-title IPFire (vesafb 1024x768, acpi=off)
+title IPFire (acpi disabled)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 3
-title IPFire (emergency - all storage drivers)
+title IPFire (single Processor)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 4
+title IPFire (all storage drivers)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER-emergency.img
-  savedefault 4
+  savedefault 5