Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index ff9af0b3c606c309ec8ececb48d56d2ce3e188b4..2199bf1d895f5244ecdd53aedbfadd2d759180bb 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -1,45 +1,21 @@
-timeout 5
+timeout 10
 default saved
-foreground = 16064e
+foreground = 6d6963
 background = ffffff
+#hiddenmenu
+# *** If you want use serial console comment next line
 splashimage (hd0,0)/grub/ipfire.xpm.gz
-title IPFire (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (640x480)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=785 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (640x480)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire (ACPI enabled) (640x480)
-  root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled) (1024x768)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
-  initrd /initrd.splash
-  savedefault
-title IPFire SMP (ACPI HT enabled) (640x480)
-  root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
-  initrd /initrd.splash
-  savedefault
+# *** 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-KVER-ipfire root=ROOT panic=10 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 0
+title IPFire (vesafb 1024x768)
+  root (hd0,0)
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
+  initrd /ipfirerd-KVER.img
+  savedefault 1