Add auto_fs & auto_fs4 kernel modules

[people/teissler/ipfire-2.x.git] / config / grub / grub.conf

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 3cca7c046d73e0489534d6785fa0b1dcce076138..8dd79adfa9f427a41c40acb805c14ba4407852e4 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -5,47 +5,27 @@ background = ffffff
 #hiddenmenu
 splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 0
-title IPFire (vesafb 1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 1
-title IPFire (acpi=off)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 2
-title IPFire (vesafb 1024x768, acpi=off)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire-smp root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
-  initrd /ipfirerd-KVER-smp.img
-  savedefault 3
-title IPFire - Single CPU
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 4
-title IPFire - Single CPU (vesafb 1024x768)
+  savedefault 0
+title IPFire (vesafb 1024x768)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 5
-title IPFire - Single CPU (acpi=off)
+  savedefault 1
+title IPFire (acpi=off)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 6
-title IPFire - Single CPU (vesafb 1024x768, acpi=off)
+  savedefault 2
+title IPFire (vesafb 1024x768, acpi=off)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 7
-title IPFire - Single CPU (emergency - all storage drivers)
+  savedefault 3
+title IPFire (emergency - all storage drivers)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER-emergency.img
-  savedefault 8
+  savedefault 4