Updated Intel e1000e driver to 1.0.2.5.

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 10f8a8919c26e79b4965dfed2f6d65b4417728f4..b4e279669b03ec3d48b79341ceeaa1faaf5ef0e5 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,21 +1,46 @@
-timeout 5\r
-default saved\r
-foreground = 16064e\r
-background = ffffff\r
-splashimage (hd0,0)/grub/ipfire.xpm.gz\r
-title IPFire\r
-  root (hd0,0)\r
-  kernel /vmlinuz root=ROOT panic=10 acpi=off ro\r
-  savedefault\r
-title IPFire SMP\r
-  root (hd0,0)\r
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro\r
-  savedefault\r
-title IPFire (ACPI enabled)\r
-  root (hd0,0)\r
-  kernel /vmlinuz root=ROOT panic=10 ro\r
-  savedefault\r
-title IPFire SMP (ACPI HT enabled)\r
-  root (hd0,0)\r
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro\r
-  savedefault\r
+timeout 10
+default saved
+foreground = 6d6963
+background = ffffff
+#hiddenmenu
+# *** If you want use serial console comment next line
+splashimage (hd0,0)/grub/ipfire.xpm.gz
+# *** add "console=ttyS0,38400n8" to kernel cmdline,
+# *** uncomment following lines and check also inittab
+#serial --unit=0 --speed=38400
+#terminal --timeout=1 serial console
+title IPFire
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 0
+title IPFire (vesafb 640x480)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 1
+title IPFire (vesafb 800x600)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=788 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 2
+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 3
+title IPFire (acpi disabled)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 4
+title IPFire (single Processor)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 5
+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 6