X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=config%2Fgrub%2Fgrub.conf;h=2199bf1d895f5244ecdd53aedbfadd2d759180bb;hb=2aeb4b256eb99c8971da60a5dff6bd3929270798;hp=c4b7e2adbe4b77e6d4d597a7982421feed8b19bc;hpb=999dc5dc3b9e9cc8fdd1e2388cee0e505cbaacd9;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index c4b7e2adb..2199bf1d8 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -3,39 +3,19 @@ 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,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 rootdelay=10 panic=10 MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT 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 1024x768)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
-  initrd /ipfirerd-KVER.img
-  savedefault 2
-title IPFire (acpi disabled)
-  root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
-  savedefault 3
-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 5
-title IPFire - experimental kernel-2.6.25.17 - no ipsec (vesafb 640x480)
-  root (hd0,0)
-  kernel /vmlinuz-2.6.25.17-ipfire root=ROOT rootdelay=10 panic=10 vga=785 MOUNT
-  initrd /ipfirerd-2.6.25.17.img
-  savedefault 6
+  savedefault 1