Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index d7deeb8202f1fb1171d854d9be26421e9299281d..2199bf1d895f5244ecdd53aedbfadd2d759180bb 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,35 +1,21 @@
 timeout 10
 default saved
-foreground = 16064e
+foreground = 6d6963
 background = ffffff
-gfxmenu /grub/message
-title IPFire (1024x768)
+#hiddenmenu
+# *** If you want use serial console comment next line
+splashimage (hd0,0)/grub/ipfire.xpm.gz
+# *** add "console=ttyS0,115200n8" to kernel cmdline,
+# *** uncomment following lines and check also inittab
+#serial --unit=0 --speed=115200
+#terminal --timeout=1 serial console
+title IPFire
   root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 0
-title IPFire (VESA)
+title IPFire (vesafb 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-ipfire root=ROOT panic=10 ro
-  initrd /initrd.splash
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire SMP (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault 2
-title IPFire SMP (VESA)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=off ro
-  initrd /initrd.splash
-  savedefault 3
-title IPFire SMP-HT (Intel Pentium 4) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault 4
-title IPFire SMP-HT (Intel Pentium 4) (VESA)
-  root (hd0,0)
-  kernel /vmlinuz-ipfire-smp root=ROOT panic=10 acpi=ht ro
-  initrd /initrd.splash
-  savedefault 5